From f89d806fc292631e816e71a0c3beeec3fbf04185 Mon Sep 17 00:00:00 2001 From: Rumble Date: Tue, 8 May 2007 19:52:43 +0000 Subject: [PATCH] more 128 bit fixes --Rumble --- src/act.other.c | 18 ++++++++++++------ src/act.wizard.c | 14 ++++++++++---- src/comm.c | 10 ++++++---- src/fight.c | 9 ++++++--- src/house.c | 14 +++++++++----- src/interpreter.c | 7 +++++-- src/medit.c | 5 ++++- src/modify.c | 6 ++++-- src/utils.c | 3 ++- 9 files changed, 58 insertions(+), 28 deletions(-) diff --git a/src/act.other.c b/src/act.other.c index fac1ada..2ab35e8 100644 --- a/src/act.other.c +++ b/src/act.other.c @@ -668,12 +668,18 @@ ACMD(do_display) return; } - if (!str_cmp(argument, "on") || !str_cmp(argument, "all")) - SET_BIT_AR(PRF_FLAGS(ch), PRF_DISPHP | PRF_DISPMANA | PRF_DISPMOVE); - else if (!str_cmp(argument, "off") || !str_cmp(argument, "none")) - REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_DISPHP | PRF_DISPMANA | PRF_DISPMOVE); - else { - REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_DISPHP | PRF_DISPMANA | PRF_DISPMOVE); + if (!str_cmp(argument, "on") || !str_cmp(argument, "all")) { + SET_BIT_AR(PRF_FLAGS(ch), PRF_DISPHP); + SET_BIT_AR(PRF_FLAGS(ch), PRF_DISPMANA); + SET_BIT_AR(PRF_FLAGS(ch), PRF_DISPMOVE); + } else if (!str_cmp(argument, "off") || !str_cmp(argument, "none")) { + REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_DISPHP); + REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_DISPMANA); + REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_DISPMOVE); + } else { + REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_DISPHP); + REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_DISPMANA); + REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_DISPMOVE); for (i = 0; i < strlen(argument); i++) { switch (LOWER(argument[i])) { diff --git a/src/act.wizard.c b/src/act.wizard.c index 14a8f53..21b1d61 100644 --- a/src/act.wizard.c +++ b/src/act.wizard.c @@ -1529,12 +1529,17 @@ ACMD(do_advance) if (oldlevel >= LVL_IMMORT && newlevel < LVL_IMMORT) { /* If they are no longer an immortal, remove the immortal only flags. */ - REMOVE_BIT_AR(PRF_FLAGS(victim), PRF_LOG1 | PRF_LOG2); - REMOVE_BIT_AR(PRF_FLAGS(victim), PRF_NOHASSLE | PRF_HOLYLIGHT | PRF_SHOWVNUMS); + REMOVE_BIT_AR(PRF_FLAGS(victim), PRF_LOG1); + REMOVE_BIT_AR(PLR_FLAGS(victim), PRF_LOG2); + REMOVE_BIT_AR(PRF_FLAGS(victim), PRF_NOHASSLE); + REMOVE_BIT_AR(PLR_FLAGS(victim), PRF_HOLYLIGHT); + REMOVE_BIT_AR(PLR_FLAGS(victim), PRF_SHOWVNUMS); run_autowiz(); } else if (oldlevel < LVL_IMMORT && newlevel >= LVL_IMMORT) { SET_BIT_AR(PRF_FLAGS(victim), PRF_LOG2); - SET_BIT_AR(PRF_FLAGS(victim), PRF_HOLYLIGHT | PRF_SHOWVNUMS | PRF_AUTOEXIT); + SET_BIT_AR(PRF_FLAGS(victim), PRF_HOLYLIGHT); + SET_BIT_AR(PRF_FLAGS(victim), PRF_SHOWVNUMS); + SET_BIT_AR(PRF_FLAGS(victim), PRF_AUTOEXIT); for (i = 1; i <= MAX_SKILLS; i++) SET_SKILL(victim, i, 100); run_autowiz(); @@ -2281,7 +2286,8 @@ ACMD(do_wizutil) send_to_char(ch, "Your victim is not flagged.\r\n"); return; } - REMOVE_BIT_AR(PLR_FLAGS(vict), PLR_THIEF | PLR_KILLER); + REMOVE_BIT_AR(PLR_FLAGS(vict), PLR_THIEF); + REMOVE_BIT_AR(PLR_FLAGS(vict), PLR_KILLER); send_to_char(ch, "Pardoned.\r\n"); send_to_char(vict, "You have been pardoned by the Gods!\r\n"); mudlog(BRF, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "(GC) %s pardoned by %s", GET_NAME(vict), GET_NAME(ch)); diff --git a/src/comm.c b/src/comm.c index a035f49..cb68802 100644 --- a/src/comm.c +++ b/src/comm.c @@ -449,9 +449,11 @@ void copyover_recover() if ((player_i = load_char(name, d->character)) >= 0) { GET_PFILEPOS(d->character) = player_i; - if (!PLR_FLAGGED(d->character, PLR_DELETED)) - REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_WRITING | PLR_MAILING | PLR_CRYO); - else + if (!PLR_FLAGGED(d->character, PLR_DELETED)) { + REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_WRITING); + REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_MAILING); + REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_CRYO); + } else fOld = FALSE; } else fOld = FALSE; @@ -1073,7 +1075,7 @@ void echo_on(struct descriptor_data *d) write_to_output(d, "%s", on_string); } -#define COLOR_ON(ch) (!IS_NPC(ch) ? (PRF_FLAGGED((ch), PRF_COLOR_1 | PRF_COLOR_2) ? 1 : 0) : 0) +#define COLOR_ON(ch) (!IS_NPC(ch) ? (PRF_FLAGGED((ch), PRF_COLOR_1) || PRF_FLAGGED((ch), PRF_COLOR_2) ? 1 : 0) : 0) /* Color replacement arrays. Renx -- 011100 */ #define A "\x1B[" diff --git a/src/fight.c b/src/fight.c index 1e2311e..efe534e 100644 --- a/src/fight.c +++ b/src/fight.c @@ -86,7 +86,8 @@ void appear(struct char_data *ch) if (affected_by_spell(ch, SPELL_INVISIBLE)) affect_from_char(ch, SPELL_INVISIBLE); - REMOVE_BIT_AR(AFF_FLAGS(ch), AFF_INVISIBLE | AFF_HIDE); + REMOVE_BIT_AR(AFF_FLAGS(ch), AFF_INVISIBLE); + REMOVE_BIT_AR(AFF_FLAGS(ch), AFF_HIDE); if (GET_LEVEL(ch) < LVL_IMMORT) act("$n slowly fades into existence.", FALSE, ch, 0, 0, TO_ROOM); @@ -371,8 +372,10 @@ void raw_kill(struct char_data * ch, struct char_data * killer) void die(struct char_data * ch, struct char_data * killer) { gain_exp(ch, -(GET_EXP(ch) / 2)); - if (!IS_NPC(ch)) - REMOVE_BIT_AR(PLR_FLAGS(ch), PLR_KILLER | PLR_THIEF); + if (!IS_NPC(ch)) { + REMOVE_BIT_AR(PLR_FLAGS(ch), PLR_KILLER); + REMOVE_BIT_AR(PLR_FLAGS(ch), PLR_THIEF); + } raw_kill(ch, killer); } diff --git a/src/house.c b/src/house.c index ec20637..70943f8 100644 --- a/src/house.c +++ b/src/house.c @@ -275,7 +275,8 @@ void House_boot(void) house_control[num_of_houses++] = temp_house; - SET_BIT_AR(ROOM_FLAGS(real_house), ROOM_HOUSE | ROOM_PRIVATE); + SET_BIT_AR(ROOM_FLAGS(real_house), ROOM_HOUSE); + SET_BIT_AR(ROOM_FLAGS(real_house), ROOM_PRIVATE); SET_BIT_AR(ROOM_FLAGS(real_atrium), ROOM_ATRIUM); House_load(temp_house.vnum); } @@ -425,7 +426,8 @@ void hcontrol_build_house(struct char_data *ch, char *arg) house_control[num_of_houses++] = temp_house; - SET_BIT_AR(ROOM_FLAGS(real_house), ROOM_HOUSE | ROOM_PRIVATE); + SET_BIT_AR(ROOM_FLAGS(real_house), ROOM_HOUSE); + SET_BIT_AR(ROOM_FLAGS(real_house), ROOM_PRIVATE); SET_BIT_AR(ROOM_FLAGS(real_atrium), ROOM_ATRIUM); House_crashsave(virt_house); @@ -453,9 +455,11 @@ void hcontrol_destroy_house(struct char_data *ch, char *arg) if ((real_house = real_room(house_control[i].vnum)) == NOWHERE) log("SYSERR: House %d had invalid vnum %d!", atoi(arg), house_control[i].vnum); - else - REMOVE_BIT_AR(ROOM_FLAGS(real_house), ROOM_HOUSE | ROOM_PRIVATE | ROOM_HOUSE_CRASH); - + else { + REMOVE_BIT_AR(ROOM_FLAGS(real_house), ROOM_HOUSE); + REMOVE_BIT_AR(ROOM_FLAGS(real_house), ROOM_PRIVATE); + REMOVE_BIT_AR(ROOM_FLAGS(real_house), ROOM_HOUSE_CRASH); + } House_delete_file(house_control[i].vnum); for (j = i; j < num_of_houses - 1; j++) diff --git a/src/interpreter.c b/src/interpreter.c index c98e9ed..e480190 100644 --- a/src/interpreter.c +++ b/src/interpreter.c @@ -1208,7 +1208,8 @@ int perform_dupe_check(struct descriptor_data *d) d->character->desc = d; d->original = NULL; d->character->char_specials.timer = 0; - REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_MAILING | PLR_WRITING); + REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_MAILING); + REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_WRITING); REMOVE_BIT_AR(AFF_FLAGS(d->character), AFF_GROUP); STATE(d) = CON_PLAYING; @@ -1383,7 +1384,9 @@ void nanny(struct descriptor_data *d, char *arg) STATE(d) = CON_NAME_CNFRM; } else { /* undo it just in case they are set */ - REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_WRITING | PLR_MAILING | PLR_CRYO); + REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_WRITING); + REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_MAILING); + REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_CRYO); REMOVE_BIT_AR(AFF_FLAGS(d->character), AFF_GROUP); d->character->player.time.logon = time(0); write_to_output(d, "Password: "); diff --git a/src/medit.c b/src/medit.c index 79bdcb8..7365ca2 100644 --- a/src/medit.c +++ b/src/medit.c @@ -680,7 +680,10 @@ void medit_parse(struct descriptor_data *d, char *arg) TOGGLE_BIT_AR(AFF_FLAGS(OLC_MOB(d)), i); /* Remove unwanted bits right away. */ - REMOVE_BIT_AR(AFF_FLAGS(OLC_MOB(d)), AFF_CHARM | AFF_POISON | AFF_GROUP | AFF_SLEEP); + REMOVE_BIT_AR(AFF_FLAGS(OLC_MOB(d)), AFF_CHARM); + REMOVE_BIT_AR(AFF_FLAGS(OLC_MOB(d)), AFF_POISON); + REMOVE_BIT_AR(AFF_FLAGS(OLC_MOB(d)), AFF_GROUP); + REMOVE_BIT_AR(AFF_FLAGS(OLC_MOB(d)), AFF_SLEEP); medit_disp_aff_flags(d); return; diff --git a/src/modify.c b/src/modify.c index 191d973..aba8c19 100644 --- a/src/modify.c +++ b/src/modify.c @@ -201,8 +201,10 @@ void string_add(struct descriptor_data *d, char *str) d->str = NULL; d->mail_to = 0; d->max_str = 0; - if (d->character && !IS_NPC(d->character)) - REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_MAILING | PLR_WRITING); + if (d->character && !IS_NPC(d->character)) { + REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_MAILING); + REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_WRITING); + } } else if (action != STRINGADD_ACTION && strlen(*d->str) + 3 <= d->max_str) /* 3 = \r\n\0 */ strcat(*d->str, "\r\n"); } diff --git a/src/utils.c b/src/utils.c index 8262233..6b92d6e 100644 --- a/src/utils.c +++ b/src/utils.c @@ -430,7 +430,8 @@ void stop_follower(struct char_data *ch) } ch->master = NULL; - REMOVE_BIT_AR(AFF_FLAGS(ch), AFF_CHARM | AFF_GROUP); + REMOVE_BIT_AR(AFF_FLAGS(ch), AFF_CHARM); + REMOVE_BIT_AR(AFF_FLAGS(ch), AFF_GROUP); } int num_followers_charmed(struct char_data *ch)