[Nov 23 2008] - Rumble

Fixed a memory leak in quest.c create_obj. (thanks Jamdog)
[Oct 21 2008] - Rumble
  Fixed display of wear locations and a typo. (thanks Kyle)
This commit is contained in:
Rumble 2008-12-05 01:24:36 +00:00
parent 6c963b8187
commit a7e4693eb6
3 changed files with 15 additions and 9 deletions

View file

@ -34,11 +34,15 @@ OLC copy and delete options.
export (QQ's a zone into a tarball)t export (QQ's a zone into a tarball)t
Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist) Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
(lots of major bugfixes too) (lots of major bugfixes too)
@
[Dec 04 2008] - Fizban [Dec 04 2008] - Fizban
DG Scripts are now attachable to players (cedit toggle defaults this behavior to off). DG Scripts are now attachable to players (cedit toggle defaults this behavior to off).
[Dec 01 2008] - Fizban [Dec 01 2008] - Fizban
Now compiles warning free on GCC 4.3.2 Now compiles warning free on GCC 4.3.2
[Nov 23 2008] - Rumble
Fixed a memory leak in quest.c create_obj. (thanks Jamdog)
[Oct 21 2008] - Rumble
Fixed display of wear locations and a typo. (thanks Kyle)
[Oct 09 2008] - Rumble [Oct 09 2008] - Rumble
Fixed a small bug in hedit. If CIRCLE_UNSIGNED_INDEX is 0, then new entries wo Fixed a small bug in hedit. If CIRCLE_UNSIGNED_INDEX is 0, then new entries wo
n't save correctly. (thanks Rhade) n't save correctly. (thanks Rhade)

View file

@ -306,8 +306,7 @@ void generic_complete_quest(struct char_data *ch)
QST_EXP(rnum)); QST_EXP(rnum));
} }
if (QST_OBJ(rnum) && QST_OBJ(rnum) != NOTHING) { if (QST_OBJ(rnum) && QST_OBJ(rnum) != NOTHING) {
if (real_object(QST_OBJ(rnum)) != NOTHING) { if (real_object(QST_OBJ(rnum))) {
if ((new_obj = create_obj()) != NULL) {
if ((new_obj = read_object((QST_OBJ(rnum)),VIRTUAL)) != NULL) { if ((new_obj = read_object((QST_OBJ(rnum)),VIRTUAL)) != NULL) {
obj_to_char(new_obj, ch); obj_to_char(new_obj, ch);
send_to_char(ch, "You have been presented with %s%s for your service.\r\n", send_to_char(ch, "You have been presented with %s%s for your service.\r\n",
@ -315,7 +314,6 @@ void generic_complete_quest(struct char_data *ch)
} }
} }
} }
}
if (!IS_SET(QST_FLAGS(rnum), AQ_REPEATABLE)) if (!IS_SET(QST_FLAGS(rnum), AQ_REPEATABLE))
add_completed_quest(ch, vnum); add_completed_quest(ch, vnum);
clear_quest(ch); clear_quest(ch);

View file

@ -604,9 +604,13 @@ static void zedit_disp_arg3(struct descriptor_data *d)
switch (OLC_CMD(d).command) { switch (OLC_CMD(d).command) {
case 'E': case 'E':
while (*equipment_types[i] != '\n') { while (*equipment_types[i] != '\n') {
write_to_output(d, "%2d) %26.26s %2d) %26.26s\r\n", i, write_to_output(d, "%2d) %26.26s", i, equipment_types[i]);
equipment_types[i], i + 1, (*equipment_types[i + 1] != '\n') ?
equipment_types[i + 1] : ""); if (*equipment_types[i + 1] != '\n')
write_to_output(d, " %2d) %26.26s", i + 1,
equipment_types[i + 1]);
write_to_output(d, "\r\n");
if (*equipment_types[i + 1] != '\n') if (*equipment_types[i + 1] != '\n')
i += 2; i += 2;
else else
@ -962,7 +966,7 @@ void zedit_parse(struct descriptor_data *d, char *arg)
more reliable. */ more reliable. */
while (*equipment_types[i] != '\n') while (*equipment_types[i] != '\n')
i++; i++;
if (pos < 0 || pos > i) if (pos < 0 || pos >= i)
write_to_output(d, "Try again : "); write_to_output(d, "Try again : ");
else { else {
OLC_CMD(d).arg3 = pos; OLC_CMD(d).arg3 = pos;