From b124dd3cb2a5e6a475ef4061b85e1e614d0e3c4a Mon Sep 17 00:00:00 2001 From: Rumble Date: Mon, 7 Jul 2008 22:59:20 +0000 Subject: [PATCH] [Jul 08 2008] - Rumble Removed duplicate questpoints listing in stat char. (thanks Mirad) Fix to qedit for deleting all quests. (thanks Jamdog) [Jul 06 2008] - Rumble Changed sedit no trade with from undefined to nobits. (thanks Mirad) --- changelog | 5 +++++ src/act.wizard.c | 2 +- src/genqst.c | 8 +++++--- src/sedit.c | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changelog b/changelog index 16a2939..880746d 100644 --- a/changelog +++ b/changelog @@ -3,6 +3,11 @@ 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 +[Jul 08 2008] - Rumble + Removed duplicate questpoints listing in stat char. (thanks Mirad) + Fix to qedit for deleting all quests. (thanks Jamdog) +[Jul 06 2008] - Rumble + Changed sedit no trade with from undefined to nobits. (thanks Mirad) [Jul 03 2008] - Rumble Fixed lib/messages to properly display skill, spell, and damage messages. (thanks Tink) [Jun 28 2008] - Rumble diff --git a/src/act.wizard.c b/src/act.wizard.c index 36ef965..d88134e 100644 --- a/src/act.wizard.c +++ b/src/act.wizard.c @@ -792,7 +792,7 @@ static void do_stat_character(struct char_data *ch, struct char_data *k) GET_GOLD(k), GET_BANK_GOLD(k), GET_GOLD(k) + GET_BANK_GOLD(k)); if (!IS_NPC(k)) - send_to_char(ch, "Questpoints: [%d] Screen %s[%s%d%sx%s%d%s]%s\r\n", GET_QUESTPOINTS(k), + send_to_char(ch, "Screen %s[%s%d%sx%s%d%s]%s\r\n", CCCYN(ch, C_NRM), CCYEL(ch, C_NRM), GET_SCREEN_WIDTH(k), CCNRM(ch, C_NRM), CCYEL(ch, C_NRM), GET_PAGE_LENGTH(k), CCCYN(ch, C_NRM), CCNRM(ch, C_NRM)); diff --git a/src/genqst.c b/src/genqst.c index 3dfe2e0..d50abeb 100644 --- a/src/genqst.c +++ b/src/genqst.c @@ -128,13 +128,14 @@ int add_quest(struct aq_data *nqst) int delete_quest(qst_rnum rnum) { qst_rnum i; - zone_rnum rznum = real_zone_by_thing(QST_NUM(rnum)); + zone_rnum rznum; mob_rnum qm = QST_MASTER(rnum); SPECIAL (*tempfunc); int quests_remaining = 0; if (rnum >= total_quests) return FALSE; + rznum = real_zone_by_thing(QST_NUM(rnum)); log("GenOLC: delete_quest: Deleting quest #%d (%s).", QST_NUM(rnum), QST_NAME(rnum)); /* make a note of the quest master's secondary spec proc */ @@ -148,9 +149,10 @@ int delete_quest(qst_rnum rnum) total_quests--; if (total_quests > 0) RECREATE(aquest_table, struct aq_data, total_quests); - else + else { free(aquest_table); - + aquest_table = NULL; + } if (rznum != NOWHERE) add_to_save_list(zone_table[rznum].number, SL_QST); else diff --git a/src/sedit.c b/src/sedit.c index 525a9c9..fcbb037 100644 --- a/src/sedit.c +++ b/src/sedit.c @@ -179,6 +179,7 @@ static void sedit_setup_new(struct descriptor_data *d) S_CLOSE1(shop) = 28; S_BUYPROFIT(shop) = 1.0; S_SELLPROFIT(shop) = 1.0; + S_NOTRADE(shop) = 0; /* Add a spice of default strings. */ S_NOITEM1(shop) = strdup("%s Sorry, I don't stock that item."); S_NOITEM2(shop) = strdup("%s You don't seem to have that.");