Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-01-06 01:18:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Jun 12 2008] - Rumble

Browse source 
Fixed toggle quest to toggle correctly.
  Fixed bug in dg find_replacement to call text_processed at the beginning, regardless of whethe
r something matching the variable is found or not. (thanks Laoris)
  Fixed log error that was using rnum instead of vnum. (thanks Jamdog)
This commit is contained in:
Rumble 2008-06-12 01:12:46 +00:00
parent cfe59d3e04
commit 107c3b2811
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
changelog
View file

@ -3,6 +3,10 @@ help, find any bugs, or have ideas for improvement please stop by TBA at
telnet://tbamud.com:9091 or email rumble@tbamud.com --Rumble
tbaMUD 3.56
[Jun 12 2008] - Rumble
Fixed toggle quest to toggle correctly.
Fixed bug in dg find_replacement to call text_processed at the beginning, regardless of whether something matching the variable is found or not. (thanks Laoris)
Fixed log error that was using rnum instead of vnum. (thanks Jamdog)
[Jun 11 2008] - Rumble
Added notification via prompt for new MOTD and news entries. (thanks Jamdog)
Added all option to the restore command. (thanks Jamdog)

4
src/act.informative.c
View file

@ -1833,8 +1833,8 @@ ACMD(do_toggle)
"You can now hear the Wiz-channel.\r\n",
"You are now deaf to the Wiz-channel.\r\n"},
{"quest", PRF_QUEST, 0,
"Okay, you are part of the Quest.\r\n",
"You are no longer part of the Quest.\r\n"},
"You are no longer part of the Quest.\r\n",
"Okay, you are part of the Quest.\r\n"},
{"showvnums", PRF_SHOWVNUMS, LVL_IMMORT,
"You will no longer see the vnums.\r\n",
"You will now see the vnums.\r\n"},

2
src/db.c
View file

@ -1155,7 +1155,7 @@ void parse_room(FILE *fl, int virtual_nr)
snprintf(buf2, sizeof(buf2), "room #%d", virtual_nr);
if (virtual_nr < zone_table[zone].bot) {
log("SYSERR: Room #%d is below zone %d.", virtual_nr, zone);
log("SYSERR: Room #%d is below zone %d (bot=%d, top=%d).", virtual_nr, zone_table[zone].number, zone_table[zone].bot, zone_table[zone].top);
exit(1);
}
while (virtual_nr > zone_table[zone].top)

8
src/dg_variables.c
View file

@ -301,6 +301,8 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
return;
}
else if (vd && text_processed(field, subfield, vd, str, slen)) return;
else {
if (vd) {
name = vd->value;
@ -523,9 +525,7 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
}
if (c) {
if (text_processed(field, subfield, vd, str, slen)) return;
else if (!str_cmp(field, "global")) { /* get global of something else */
if (!str_cmp(field, "global")) { /* get global of something else */
if (IS_NPC(c) && c->script) {
find_replacement(go, c->script, NULL, MOB_TRIGGER,
subfield, NULL, NULL, str, slen);
@ -1051,7 +1051,6 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
} /* if (c) ...*/
else if (o) {
if (text_processed(field, subfield, vd, str, slen)) return;
*str = '\x1';
switch (LOWER(*field)) {
@ -1248,7 +1247,6 @@ o->contains) ? "1" : "0"));
} /* if (o) ... */
else if (r) {
if (text_processed(field, subfield, vd, str, slen)) return;
/* special handling of the void, as it stores all 'full global' variables */
if (r->number == 0) {