Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2025-12-21 17:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

more 128 bit fixes --Rumble

Browse source
This commit is contained in:
Rumble 2007-05-08 19:52:43 +00:00
parent ff62d18b37
commit f89d806fc2
9 changed files with 58 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/act.other.c
View file

@ -668,12 +668,18 @@ ACMD(do_display)
return; return;
} }
if (!str_cmp(argument, "on") || !str_cmp(argument, "all")) if (!str_cmp(argument, "on") || !str_cmp(argument, "all")) {
SET_BIT_AR(PRF_FLAGS(ch), PRF_DISPHP | PRF_DISPMANA | PRF_DISPMOVE); SET_BIT_AR(PRF_FLAGS(ch), PRF_DISPHP);
else if (!str_cmp(argument, "off") || !str_cmp(argument, "none")) SET_BIT_AR(PRF_FLAGS(ch), PRF_DISPMANA);
REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_DISPHP | PRF_DISPMANA | PRF_DISPMOVE); SET_BIT_AR(PRF_FLAGS(ch), PRF_DISPMOVE);
else { } else if (!str_cmp(argument, "off") || !str_cmp(argument, "none")) {
REMOVE_BIT_AR(PRF_FLAGS(ch), PRF_DISPHP | PRF_DISPMANA | PRF_DISPMOVE); 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++) { for (i = 0; i < strlen(argument); i++) {
switch (LOWER(argument[i])) { switch (LOWER(argument[i])) {

14
src/act.wizard.c
View file

@ -1529,12 +1529,17 @@ ACMD(do_advance)
if (oldlevel >= LVL_IMMORT && newlevel < LVL_IMMORT) { if (oldlevel >= LVL_IMMORT && newlevel < LVL_IMMORT) {
/* If they are no longer an immortal, remove the immortal only flags. */ /* 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_LOG1);
REMOVE_BIT_AR(PRF_FLAGS(victim), PRF_NOHASSLE | PRF_HOLYLIGHT | PRF_SHOWVNUMS); 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(); run_autowiz();
} else if (oldlevel < LVL_IMMORT && newlevel >= LVL_IMMORT) { } else if (oldlevel < LVL_IMMORT && newlevel >= LVL_IMMORT) {
SET_BIT_AR(PRF_FLAGS(victim), PRF_LOG2); 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++) for (i = 1; i <= MAX_SKILLS; i++)
SET_SKILL(victim, i, 100); SET_SKILL(victim, i, 100);
run_autowiz(); run_autowiz();
@ -2281,7 +2286,8 @@ ACMD(do_wizutil)
send_to_char(ch, "Your victim is not flagged.\r\n"); send_to_char(ch, "Your victim is not flagged.\r\n");
return; 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(ch, "Pardoned.\r\n");
send_to_char(vict, "You have been pardoned by the Gods!\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)); mudlog(BRF, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "(GC) %s pardoned by %s", GET_NAME(vict), GET_NAME(ch));

10
src/comm.c
View file

@ -449,9 +449,11 @@ void copyover_recover()
if ((player_i = load_char(name, d->character)) >= 0) { if ((player_i = load_char(name, d->character)) >= 0) {
GET_PFILEPOS(d->character) = player_i; GET_PFILEPOS(d->character) = player_i;
if (!PLR_FLAGGED(d->character, PLR_DELETED)) if (!PLR_FLAGGED(d->character, PLR_DELETED)) {
REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_WRITING | PLR_MAILING | PLR_CRYO); REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_WRITING);
else REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_MAILING);
REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_CRYO);
} else
fOld = FALSE; fOld = FALSE;
} else } else
fOld = FALSE; fOld = FALSE;
@ -1073,7 +1075,7 @@ void echo_on(struct descriptor_data *d)
write_to_output(d, "%s", on_string); 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 */ /* Color replacement arrays. Renx -- 011100 */
#define A "\x1B[" #define A "\x1B["

9
src/fight.c
View file

@ -86,7 +86,8 @@ void appear(struct char_data *ch)
if (affected_by_spell(ch, SPELL_INVISIBLE)) if (affected_by_spell(ch, SPELL_INVISIBLE))
affect_from_char(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) if (GET_LEVEL(ch) < LVL_IMMORT)
act("$n slowly fades into existence.", FALSE, ch, 0, 0, TO_ROOM); 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) void die(struct char_data * ch, struct char_data * killer)
{ {
gain_exp(ch, -(GET_EXP(ch) / 2)); gain_exp(ch, -(GET_EXP(ch) / 2));
if (!IS_NPC(ch)) if (!IS_NPC(ch)) {
REMOVE_BIT_AR(PLR_FLAGS(ch), PLR_KILLER | PLR_THIEF); REMOVE_BIT_AR(PLR_FLAGS(ch), PLR_KILLER);
REMOVE_BIT_AR(PLR_FLAGS(ch), PLR_THIEF);
}
raw_kill(ch, killer); raw_kill(ch, killer);
} }

14
src/house.c
View file

@ -275,7 +275,8 @@ void House_boot(void)
house_control[num_of_houses++] = temp_house; 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); SET_BIT_AR(ROOM_FLAGS(real_atrium), ROOM_ATRIUM);
House_load(temp_house.vnum); 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; 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); SET_BIT_AR(ROOM_FLAGS(real_atrium), ROOM_ATRIUM);
House_crashsave(virt_house); 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) if ((real_house = real_room(house_control[i].vnum)) == NOWHERE)
log("SYSERR: House %d had invalid vnum %d!", atoi(arg), house_control[i].vnum); log("SYSERR: House %d had invalid vnum %d!", atoi(arg), house_control[i].vnum);
else else {
REMOVE_BIT_AR(ROOM_FLAGS(real_house), ROOM_HOUSE | ROOM_PRIVATE | ROOM_HOUSE_CRASH); 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); House_delete_file(house_control[i].vnum);
for (j = i; j < num_of_houses - 1; j++) for (j = i; j < num_of_houses - 1; j++)

7
src/interpreter.c
View file

@ -1208,7 +1208,8 @@ int perform_dupe_check(struct descriptor_data *d)
d->character->desc = d; d->character->desc = d;
d->original = NULL; d->original = NULL;
d->character->char_specials.timer = 0; 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); REMOVE_BIT_AR(AFF_FLAGS(d->character), AFF_GROUP);
STATE(d) = CON_PLAYING; STATE(d) = CON_PLAYING;
@ -1383,7 +1384,9 @@ void nanny(struct descriptor_data *d, char *arg)
STATE(d) = CON_NAME_CNFRM; STATE(d) = CON_NAME_CNFRM;
} else { } else {
/* undo it just in case they are set */ /* 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); REMOVE_BIT_AR(AFF_FLAGS(d->character), AFF_GROUP);
d->character->player.time.logon = time(0); d->character->player.time.logon = time(0);
write_to_output(d, "Password: "); write_to_output(d, "Password: ");

5
src/medit.c
View file

@ -680,7 +680,10 @@ void medit_parse(struct descriptor_data *d, char *arg)
TOGGLE_BIT_AR(AFF_FLAGS(OLC_MOB(d)), i); TOGGLE_BIT_AR(AFF_FLAGS(OLC_MOB(d)), i);
/* Remove unwanted bits right away. */ /* 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); medit_disp_aff_flags(d);
return; return;

6
src/modify.c
View file

@ -201,8 +201,10 @@ void string_add(struct descriptor_data *d, char *str)
d->str = NULL; d->str = NULL;
d->mail_to = 0; d->mail_to = 0;
d->max_str = 0; d->max_str = 0;
if (d->character && !IS_NPC(d->character)) if (d->character && !IS_NPC(d->character)) {
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);
}
} else if (action != STRINGADD_ACTION && strlen(*d->str) + 3 <= d->max_str) /* 3 = \r\n\0 */ } else if (action != STRINGADD_ACTION && strlen(*d->str) + 3 <= d->max_str) /* 3 = \r\n\0 */
strcat(*d->str, "\r\n"); strcat(*d->str, "\r\n");
} }

3
src/utils.c
View file

@ -430,7 +430,8 @@ void stop_follower(struct char_data *ch)
} }
ch->master = NULL; 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) int num_followers_charmed(struct char_data *ch)