diff --git a/changelog b/changelog index c931ff5..fa54bd2 100644 --- a/changelog +++ b/changelog @@ -5,6 +5,9 @@ The Builder Academy builderacademy.net 9091 tbaMUD 3.55 +[Jan 06 2008] - Rumble + Removed break in oedit_disp_val1_menu ITEM_NOTE that caused a delay. (thanks Rhade) + Fixed tlist when specifying a range. (thanks Rhade) [Jan 05 2008] - Rumble Fixed improper display of affections in stat player. (thanks Rhade) [Jan 04 2008] - Rumble diff --git a/src/act.informative.c b/src/act.informative.c index 2f719b7..5858731 100644 --- a/src/act.informative.c +++ b/src/act.informative.c @@ -1772,7 +1772,7 @@ ACMD(do_toggle) { char buf2[4], arg[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH]; int toggle, tp, wimp_lev, result = 0, len = 0; - const char *types[] = { "OFF", "BRIEF", "NORMAL", "ON", "\n" }; + const char *types[] = { "off", "brief", "normal", "on", "\n" }; const struct { char *command; diff --git a/src/act.wizard.c b/src/act.wizard.c index 2fc346f..4f5b373 100644 --- a/src/act.wizard.c +++ b/src/act.wizard.c @@ -943,8 +943,7 @@ void do_stat_character(struct char_data *ch, struct char_data *k) if (aff->modifier) send_to_char(ch, ", "); - strcpy(buf, affected_bits[aff->bitvector]); - send_to_char(ch, "sets %s", buf); + send_to_char(ch, "sets %s", affected_bits[aff->bitvector]); } send_to_char(ch, "\r\n"); } diff --git a/src/oasis_list.c b/src/oasis_list.c index 3ad11a9..83a5c0c 100644 --- a/src/oasis_list.c +++ b/src/oasis_list.c @@ -460,6 +460,10 @@ void list_triggers(struct char_data *ch, zone_rnum rnum, trig_vnum vmin, trig_vn } } - if (counter == 0) - send_to_char(ch, "No triggers found for zone #%d\r\n", zone_table[rnum].number); + if (counter == 0) { + if (rnum == NOWHERE) + send_to_char(ch, "No triggers found from %d to %d\r\n", vmin, vmax); + else + send_to_char(ch, "No triggers found for zone #%d\r\n", zone_table[rnum].number); + } } diff --git a/src/oedit.c b/src/oedit.c index 7c3a4e5..766145e 100644 --- a/src/oedit.c +++ b/src/oedit.c @@ -450,7 +450,6 @@ void oedit_disp_val1_menu(struct descriptor_data *d) write_to_output(d, "Number of gold coins : "); break; case ITEM_NOTE: - break; case ITEM_FURNITURE: write_to_output(d, "Number of people it can hold : "); break; diff --git a/src/structs.h b/src/structs.h index c1bfe6f..0cbeb92 100644 --- a/src/structs.h +++ b/src/structs.h @@ -432,7 +432,7 @@ /* 128 Bits */ #define RF_ARRAY_MAX 4 #define PM_ARRAY_MAX 4 -#define PR_ARRAY_MAX NUM_PRF_FLAGS / 32 + 1 +#define PR_ARRAY_MAX 4 #define AF_ARRAY_MAX 4 #define TW_ARRAY_MAX 4 #define EF_ARRAY_MAX 4 @@ -768,7 +768,7 @@ struct player_special_data_saved { byte freeze_level; /* Level of god who froze char, if any */ sh_int invis_level; /* level of invisibility */ room_vnum load_room; /* Which room to place char in */ - int pref[NUM_PRF_FLAGS /32 + 1]; /* preference flags for players */ + int pref[PR_ARRAY_MAX]; /* preference flags for players */ ubyte bad_pws; /* number of bad password attemps */ sbyte conditions[3]; /* Drunk, hunger, thirst */ struct txt_block *comm_hist[NUM_HIST]; /* Player's comms history */