Renumbered UNUSED triggers to UNUSED# to make it easier to unset them when cha

nging trig types. (thanks Parna)
  Fixed double free in IBT that caused crash on /a or saving without any descrip
tion.
This commit is contained in:
Rumble
2009-12-07 04:40:16 +00:00
parent 66e4b7ec0c
commit 32880daf6b
6 changed files with 1136 additions and 1123 deletions

View File

@@ -36,6 +36,9 @@ Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
(lots of major bugfixes too) (lots of major bugfixes too)
@ @
tbaMUD 3.61 tbaMUD 3.61
[Dec 07 2009] - Rumble
Renumbered UNUSED triggers to UNUSED# to make it easier to unset them when changing trig types. (thanks Parna)
Fixed double free in IBT that caused crash on /a or saving without any description.
[Dec 06 2009] - Rumble [Dec 06 2009] - Rumble
Fixed medit sex and position numbering. The numbering was wrong with the new column_list. Fixed medit sex and position numbering. The numbering was wrong with the new column_list.
Fixed medit autoroll so it would recognize a change and save. Fixed medit autoroll so it would recognize a change and save.

View File

@@ -0,0 +1,16 @@
Text test2~
Body test2
~
Name Rumble~
Level 34
Room 1204
Flags 1 0 0 0
End
Text test 5~
Body test5
~
Name Rumble~
Level 34
Room 1204
Flags 0 0 0 0
End

View File

@@ -857,21 +857,21 @@ const char *otrig_types[] = {
"Global", "Global",
"Random", "Random",
"Command", "Command",
"UNUSED", "UNUSED1",
"UNUSED", "UNUSED2",
"Timer", "Timer",
"Get", "Get",
"Drop", "Drop",
"Give", "Give",
"Wear", "Wear",
"UNUSED", "UNUSED3",
"Remove", "Remove",
"UNUSED", "UNUSED4",
"Load", "Load",
"UNUSED", "UNUSED5",
"Cast", "Cast",
"Leave", "Leave",
"UNUSED", "UNUSED6",
"Consume", "Consume",
"Time", "Time",
"\n" "\n"
@@ -883,17 +883,17 @@ const char *wtrig_types[] = {
"Random", "Random",
"Command", "Command",
"Speech", "Speech",
"UNUSED", "UNUSED1",
"Zone Reset", "Zone Reset",
"Enter", "Enter",
"Drop", "Drop",
"UNUSED", "UNUSED2",
"UNUSED", "UNUSED3",
"UNUSED", "UNUSED4",
"UNUSED", "UNUSED5",
"UNUSED", "UNUSED6",
"UNUSED", "UNUSED7",
"UNUSED", "UNUSED8",
"Cast", "Cast",
"Leave", "Leave",
"Door", "Door",

View File

@@ -243,8 +243,6 @@ static void playing_string_cleanup(struct descriptor_data *d, int action)
save_ibt_file(SCMD_IDEA); save_ibt_file(SCMD_IDEA);
} else { } else {
write_to_output(d, "Idea aborted!\r\n"); write_to_output(d, "Idea aborted!\r\n");
free(*d->str);
free(d->str);
} }
} }
if (PLR_FLAGGED(d->character, PLR_BUG)) { if (PLR_FLAGGED(d->character, PLR_BUG)) {
@@ -253,8 +251,6 @@ static void playing_string_cleanup(struct descriptor_data *d, int action)
save_ibt_file(SCMD_BUG); save_ibt_file(SCMD_BUG);
} else { } else {
write_to_output(d, "Bug aborted!\r\n"); write_to_output(d, "Bug aborted!\r\n");
free(*d->str);
free(d->str);
} }
} }
if (PLR_FLAGGED(d->character, PLR_TYPO)) { if (PLR_FLAGGED(d->character, PLR_TYPO)) {
@@ -263,8 +259,6 @@ static void playing_string_cleanup(struct descriptor_data *d, int action)
save_ibt_file(SCMD_TYPO); save_ibt_file(SCMD_TYPO);
} else { } else {
write_to_output(d, "Typo aborted!\r\n"); write_to_output(d, "Typo aborted!\r\n");
free(*d->str);
free(d->str);
} }
} }
} }