From 06365ca3274fc48b3c0b69418c1f8ee0d63a9a37 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 23 Feb 2015 09:11:57 +0100 Subject: Remove a few unused fields in player_type --- src/birth.cc | 3 -- src/cmd7.cc | 20 -------- src/defines.h | 7 --- src/dungeon.cc | 153 +------------------------------------------------------- src/externs.h | 6 --- src/loadsave.cc | 34 ++++++------- src/skills.cc | 3 -- src/spells2.cc | 4 -- src/spells3.cc | 1 - src/types.h | 27 ---------- src/xtra1.cc | 56 --------------------- src/xtra2.cc | 120 -------------------------------------------- 12 files changed, 18 insertions(+), 416 deletions(-) diff --git a/src/birth.cc b/src/birth.cc index d0074e0e..1e01b4ba 100644 --- a/src/birth.cc +++ b/src/birth.cc @@ -938,9 +938,6 @@ static void player_wipe(void) /* Wipe the bounties */ total_bounties = 0; - /* Wipe spells */ - p_ptr->xtra_spells = 0; - /* Wipe xtra hp */ p_ptr->hp_mod = 0; diff --git a/src/cmd7.cc b/src/cmd7.cc index a15493a4..040e0683 100644 --- a/src/cmd7.cc +++ b/src/cmd7.cc @@ -7091,26 +7091,6 @@ void do_cmd_summoner(void) } -/* - * Fighters may invoke The Rush. - */ -void do_cmd_blade(void) -{ - /* Are we already Rushed? */ - if (p_ptr->rush) - { - msg_format("You have %d turns of The Rush remaining", p_ptr->rush); - return; - } - - /* Are you sure? */ - if (!get_check("Are you sure you want to invoke The Rush?")) return; - - /* Let's Rush! */ - set_rush(2 + p_ptr->lev / 2 + randint(p_ptr->lev / 2)); -} - - /* * Dodge Chance Feedback. */ diff --git a/src/defines.h b/src/defines.h index 52412eda..ac6c40cf 100644 --- a/src/defines.h +++ b/src/defines.h @@ -540,7 +540,6 @@ /* XXX */ #define MKEY_MINDCRAFT 2 #define MKEY_ANTIMAGIC 3 -#define MKEY_BLADE 4 #define MKEY_ALCHEMY 5 #define MKEY_MIMIC 6 #define MKEY_NECRO 7 @@ -4038,13 +4037,7 @@ * Various class dependant defines */ #define CLASS_NONE 0 -#define CLASS_MANA_PATH 1 -#define CLASS_CANALIZE_MANA 2 -#define CLASS_WINDS_MANA 3 -#define CLASS_MANA_PATH_ERASE 0x0001 -#define CLASS_FLOOD_LEVEL 0x0002 -#define CLASS_CANALIZE_MANA_EXTRA 0x0004 #define CLASS_UNDEAD 0x0008 #define CLASS_ANTIMAGIC 0x0010 #define CLASS_LEGS 0x0020 diff --git a/src/dungeon.cc b/src/dungeon.cc index 6b5153a1..3f28de2f 100644 --- a/src/dungeon.cc +++ b/src/dungeon.cc @@ -808,117 +808,6 @@ static int process_lasting_spell(s16b music) return spell_type_produce_effect_lasting(spell); } -static void gere_class_special() -{ - switch (p_ptr->druid_extra2) - { - /* Lay a path of mana on the floor */ - case CLASS_MANA_PATH: - { - /* Does the player have enought mana ? */ - if (p_ptr->csp < (s32b)(p_ptr->druid_extra & 255)) - { - p_ptr->druid_extra = 0; - p_ptr->druid_extra2 = CLASS_NONE; - msg_print("You stop laying a mana path."); - } - else - { - /* Use some mana */ - p_ptr->csp -= (p_ptr->druid_extra & 255); - - if ((p_ptr->druid_extra >> 8) & CLASS_MANA_PATH_ERASE) - { - /* Absorb some of the mana of the grid */ - p_ptr->csp += cave[p_ptr->py][p_ptr->px].mana / 50; - if (p_ptr->csp > p_ptr->msp) p_ptr->csp = p_ptr->msp; - - /* Set the new grid mana */ - cave[p_ptr->py][p_ptr->px].mana = p_ptr->druid_extra & 255; - } - else - { - int m = cave[p_ptr->py][p_ptr->px].mana; - - if (m + (p_ptr->druid_extra & 255) > 255) - { - cave[p_ptr->py][p_ptr->px].mana = 255; - } - else - { - cave[p_ptr->py][p_ptr->px].mana += p_ptr->druid_extra & 255; - } - } - } - - break; - } - - /* Lay a path of mana on the floor */ - case CLASS_WINDS_MANA: - { - /* Does the player have enought mana ? */ - if (p_ptr->csp < (s32b)(p_ptr->druid_extra & 255)) - { - p_ptr->druid_extra = CLASS_NONE; - msg_print("You stop expulsing mana winds."); - } - else - { - int dam = 0; - - /* Use some mana */ - p_ptr->csp -= (p_ptr->druid_extra & 255); - - if ((p_ptr->druid_extra >> 8) & CLASS_MANA_PATH_ERASE) - { - dam = (p_ptr->druid_extra & 255) + 256; - } - else - { - dam = (p_ptr->druid_extra & 255); - } - - fire_explosion(p_ptr->py, p_ptr->px, GF_WINDS_MANA, 2, dam); - } - - break; - } - - case CLASS_CANALIZE_MANA: - { - if (p_ptr->druid_extra & CLASS_CANALIZE_MANA_EXTRA) - { - p_ptr->csp += cave[p_ptr->py][p_ptr->px].mana / 10; - } - else - { - p_ptr->csp += cave[p_ptr->py][p_ptr->px].mana / 20; - } - - if (p_ptr->csp > p_ptr->msp) p_ptr->csp = p_ptr->msp; - - cave[p_ptr->py][p_ptr->px].mana = 0; - - break; - } - - /* CLASS_NONE, possibly others? */ - default: - { - /* No mana update */ - return; - } - } - - /* Redraw mana */ - p_ptr->update |= (PU_BONUS); - - /* Window stuff */ - p_ptr->window |= (PW_PLAYER); -} - - static void check_music() { int use_mana; @@ -1329,9 +1218,6 @@ static void process_world(void) } } - /* Handle class special actions */ - gere_class_special(); - /* Check the fate */ if (fate_option && (p_ptr->lev > 10)) { @@ -1537,7 +1423,7 @@ static void process_world(void) /* Drown in deep water unless the player have levitation, water walking water breathing, or magic breathing.*/ - if (!p_ptr->ffall && !p_ptr->walk_water && !p_ptr->magical_breath && + if (!p_ptr->ffall && !p_ptr->magical_breath && !p_ptr->water_breath && (cave[p_ptr->py][p_ptr->px].feat == FEAT_DEEP_WATER)) { @@ -1979,24 +1865,12 @@ static void process_world(void) } } - /* Walk water */ - if (p_ptr->walk_water) - { - (void)set_walk_water(p_ptr->walk_water - 1); - } - /* True Strike */ if (p_ptr->strike) { (void)set_strike(p_ptr->strike - 1); } - /* Meditation */ - if (p_ptr->meditation) - { - (void)set_meditation(p_ptr->meditation - 1); - } - /* Timed project */ if (p_ptr->tim_project) { @@ -2055,12 +1929,6 @@ static void process_world(void) (void)set_prob_travel(p_ptr->prob_travel - 1); } - /* Timed Time Resistance */ - if (p_ptr->tim_res_time) - { - (void)set_tim_res_time(p_ptr->tim_res_time - 1); - } - /* Timed Levitation */ if (p_ptr->tim_ffall) { @@ -2119,12 +1987,6 @@ static void process_world(void) (void)set_poison(p_ptr->tim_poison - 1); } - /* Timed Fire Aura */ - if (p_ptr->tim_fire_aura) - { - (void)set_tim_fire_aura(p_ptr->tim_fire_aura - 1); - } - /* Brightness */ if (p_ptr->tim_lite) { @@ -2323,19 +2185,6 @@ static void process_world(void) (void)set_oppose_nex(p_ptr->oppose_nex - 1); } - /* Mental Barrier */ - if (p_ptr->tim_mental_barrier) - { - (void)set_mental_barrier(p_ptr->tim_mental_barrier - 1); - } - - /* The rush */ - if (p_ptr->rush) - { - (void)set_rush(p_ptr->rush - 1); - } - - /* Timed mimicry */ if (get_skill(SKILL_MIMICRY)) { diff --git a/src/externs.h b/src/externs.h index eaf23419..5f4003ee 100644 --- a/src/externs.h +++ b/src/externs.h @@ -747,7 +747,6 @@ extern void cast_magic_spell(int spell, byte level); extern void do_cmd_summoner(void); extern void do_cmd_mindcraft(void); extern void do_cmd_mimic(void); -extern void do_cmd_blade(void); extern void use_ability_blade(void); extern bool_ alchemist_exists(int tval, int sval, int ego, int artifact); extern void rod_tip_extract(object_type *o_ptr); @@ -1504,7 +1503,6 @@ extern void clean_wish_name(char *buf, char *name); extern bool_ test_object_wish(char *name, object_type *o_ptr, object_type *forge, const char *what); extern bool_ set_roots(int v, s16b ac, s16b dam); extern bool_ set_project(int v, s16b gf, s16b dam, s16b rad, s16b flag); -extern bool_ set_rush(int v); extern bool_ set_parasite(int v, int r); extern bool_ set_disrupt_shield(int v); extern bool_ set_prob_travel(int v); @@ -1512,17 +1510,13 @@ extern bool_ set_absorb_soul(int v); extern bool_ set_tim_breath(int v, bool_ magical); extern bool_ set_tim_precognition(int v); extern bool_ set_tim_deadly(int v); -extern bool_ set_tim_res_time(int v); extern bool_ set_tim_reflect(int v); extern bool_ set_tim_thunder(int v, int p1, int p2); -extern bool_ set_meditation(int v); extern bool_ set_strike(int v); -extern bool_ set_walk_water(int v); extern bool_ set_tim_regen(int v, int p); extern bool_ set_tim_ffall(int v); extern bool_ set_tim_fly(int v); extern bool_ set_poison(int v); -extern bool_ set_tim_fire_aura(int v); extern bool_ set_holy(int v); extern void set_grace(s32b v); extern bool_ set_mimic(int v, int p, int level); diff --git a/src/loadsave.cc b/src/loadsave.cc index d992af75..c0a2522b 100644 --- a/src/loadsave.cc +++ b/src/loadsave.cc @@ -565,9 +565,9 @@ static bool_ do_extra(int flag) do_s16b(&p_ptr->tim_wraith, flag); do_s16b(&p_ptr->tim_ffall, flag); do_ver_s16b(&p_ptr->tim_fly, SAVEFILE_VERSION, 0, flag); - do_s16b(&p_ptr->tim_fire_aura, flag); + do_s16b(&tmp16s, flag); do_ver_s16b(&p_ptr->tim_poison, SAVEFILE_VERSION, 0, flag); - do_s16b(&p_ptr->resist_magic, flag); + do_s16b(&tmp16s, flag); do_s16b(&p_ptr->tim_invisible, flag); do_s16b(&p_ptr->tim_inv_pow, flag); do_s16b(&p_ptr->tim_mimic, flag); @@ -576,13 +576,13 @@ static bool_ do_extra(int flag) do_ver_s16b(&p_ptr->tim_regen, SAVEFILE_VERSION, 0, flag); do_ver_s16b(&p_ptr->tim_regen_pow, SAVEFILE_VERSION, 0, flag); do_s16b(&p_ptr->holy, flag); - do_s16b(&p_ptr->walk_water, flag); - do_s16b(&p_ptr->tim_mental_barrier, flag); + do_s16b(&tmp16s, flag); + do_s16b(&tmp16s, flag); do_s16b(&p_ptr->immov_cntr, flag); do_s16b(&p_ptr->strike, flag); - do_s16b(&p_ptr->meditation, flag); + do_s16b(&tmp16s, flag); do_s16b(&p_ptr->tim_reflect, flag); - do_s16b(&p_ptr->tim_res_time, flag); + do_s16b(&tmp16s, flag); do_s16b(&p_ptr->tim_deadly, flag); do_s16b(&p_ptr->prob_travel, flag); do_s16b(&p_ptr->disrupt_shield, flag); @@ -624,7 +624,7 @@ static bool_ do_extra(int flag) do_byte(&p_ptr->special, flag); do_byte((byte*)&ambush_flag, flag); do_byte(&p_ptr->allow_one_death, flag); - do_s16b(&p_ptr->xtra_spells, flag); + do_s16b(&tmp16s, flag); do_byte(&tmp8u, flag); @@ -634,21 +634,21 @@ static bool_ do_extra(int flag) /* Auxilliary variables */ do_u32b(&p_ptr->mimic_extra, flag); do_u32b(&p_ptr->antimagic_extra, flag); - do_u32b(&p_ptr->druid_extra, flag); - do_u32b(&p_ptr->druid_extra2, flag); - do_u32b(&p_ptr->druid_extra3, flag); + do_u32b(&tmp32u, flag); + do_u32b(&tmp32u, flag); + do_u32b(&tmp32u, flag); do_u32b(&p_ptr->music_extra, flag); do_u32b(&tmp32u, flag); do_u32b(&p_ptr->necro_extra, flag); do_u32b(&p_ptr->necro_extra2, flag); - do_u32b(&p_ptr->race_extra1, flag); - do_u32b(&p_ptr->race_extra2, flag); - do_u32b(&p_ptr->race_extra3, flag); - do_u32b(&p_ptr->race_extra4, flag); - do_u32b(&p_ptr->race_extra5, flag); - do_u32b(&p_ptr->race_extra6, flag); - do_u32b(&p_ptr->race_extra7, flag); + do_u32b(&tmp32u, flag); + do_u32b(&tmp32u, flag); + do_u32b(&tmp32u, flag); + do_u32b(&tmp32u, flag); + do_u32b(&tmp32u, flag); + do_u32b(&tmp32u, flag); + do_u32b(&tmp32u, flag); do_u16b(&p_ptr->body_monster, flag); do_byte((byte*)&p_ptr->disembodied, flag); diff --git a/src/skills.cc b/src/skills.cc index e8291ce4..0d3c39a3 100644 --- a/src/skills.cc +++ b/src/skills.cc @@ -1003,9 +1003,6 @@ void do_cmd_activate_skill() case MKEY_TELEKINESIS: do_cmd_portable_hole(); break; - case MKEY_BLADE: - do_cmd_blade(); - break; case MKEY_SUMMON: do_cmd_summoner(); break; diff --git a/src/spells2.cc b/src/spells2.cc index c837a059..33dcb75b 100644 --- a/src/spells2.cc +++ b/src/spells2.cc @@ -1192,10 +1192,6 @@ void self_knowledge(FILE *fff) { info[i++] = "You are looking around very carefully."; } - if (p_ptr->new_spells) - { - info[i++] = "You can learn some spells/prayers."; - } if (p_ptr->word_recall) { info[i++] = "You will soon be recalled."; diff --git a/src/spells3.cc b/src/spells3.cc index 9050cab9..ab06eb6a 100644 --- a/src/spells3.cc +++ b/src/spells3.cc @@ -2414,7 +2414,6 @@ casting_result meta_disperse_magic() if (get_level_s(DISPERSEMAGIC, 50) >= 15) { res = cplus(res, set_stun(0)); - res = cplus(res, set_meditation(0)); res = cplus(res, set_cut(0)); } if (get_level_s(DISPERSEMAGIC, 50) >= 20) diff --git a/src/types.h b/src/types.h index c207614b..f87e760e 100644 --- a/src/types.h +++ b/src/types.h @@ -1473,13 +1473,10 @@ struct player_type s16b oppose_ss; /* Timed -- oppose sound & shards */ s16b oppose_nex; /* Timed -- oppose nexus */ - s16b rush; /* Rush and Bush */ - s16b tim_esp; /* Timed ESP */ s16b tim_wraith; /* Timed wraithform */ s16b tim_ffall; /* Timed Levitation */ s16b tim_fly; /* Timed Levitation */ - s16b tim_fire_aura; /* Timed Fire Aura */ s16b tim_poison; /* Timed poison hands */ s16b tim_thunder; /* Timed thunderstorm */ s16b tim_thunder_p1; /* Timed thunderstorm */ @@ -1495,7 +1492,6 @@ struct player_type s16b tim_roots_ac; s16b tim_roots_dam; - s16b resist_magic; /* Timed Resist Magic (later) */ s16b tim_invisible; /* Timed Invisibility */ s16b tim_inv_pow; /* Power of timed invisibility */ s16b tim_mimic; /* Timed Mimic */ @@ -1503,12 +1499,8 @@ struct player_type s16b tim_regen; /* Timed extra regen */ s16b tim_regen_pow; /* Timed extra regen power */ s16b holy; /* Holy Aura */ - s16b walk_water; /* Walk over water as a god */ - s16b tim_mental_barrier; /* Sustain Int&Wis */ s16b strike; /* True Strike(+25 hit) */ - s16b meditation; /* Meditation(+50 mana -25 to hit/to dam) */ s16b tim_reflect; /* Timed Reflection */ - s16b tim_res_time; /* Timed Resistance to Time */ s16b tim_deadly; /* Timed deadly blow */ s16b prob_travel; /* Timed probability travel */ s16b disrupt_shield;/* Timed disruption shield */ @@ -1531,12 +1523,6 @@ struct player_type byte confusing; /* Glowing hands */ byte searching; /* Currently searching */ - s16b new_spells; /* Number of spells available */ - - s16b old_spells; - - s16b xtra_spells; /* Number of xtra spell learned(via potion) */ - bool_ old_cumber_armor; bool_ old_cumber_glove; bool_ old_heavy_wield; @@ -1682,29 +1668,16 @@ struct player_type byte throw_mult; /* Multiplier for throw damage */ - byte tval_xtra; /* Correct xtra tval */ - byte tval_ammo; /* Correct ammo tval */ s16b pspeed; /* Current speed */ u32b mimic_extra; /* Mimicry powers use that */ u32b antimagic_extra; /* Antimagic powers */ - u32b druid_extra; /* Druid powers */ - u32b druid_extra2; /* Druid powers */ - u32b druid_extra3; /* Druid powers */ u32b music_extra; /* Music songs */ u32b necro_extra; /* Necro powers */ u32b necro_extra2; /* Necro powers */ - u32b race_extra1; /* Variable for race */ - u32b race_extra2; /* Variable for race */ - u32b race_extra3; /* Variable for race */ - u32b race_extra4; /* Variable for race */ - u32b race_extra5; /* Variable for race */ - u32b race_extra6; /* Variable for race */ - u32b race_extra7; /* Variable for race */ - s16b dodge_chance; /* Dodging chance */ u32b maintain_sum; /* Do we have partial summons */ diff --git a/src/xtra1.cc b/src/xtra1.cc index 035da22d..fc319d73 100644 --- a/src/xtra1.cc +++ b/src/xtra1.cc @@ -1457,19 +1457,6 @@ static void fix_m_list(void) } -/* - * Calculate number of spells player should have, and forget, - * or remember, spells until that number is properly reflected. - * - * Note that this function induces various "status" messages, - * which must be bypasses until the character is created. - */ -static void calc_spells(void) -{ - p_ptr->new_spells = 0; -} - - /* * Calculate powers of player given the current set of corruptions. */ @@ -1726,13 +1713,6 @@ static void calc_mana(void) msp -= ((cur_wgt - max_wgt) / 10); } - /* When meditating your mana is increased ! */ - if (p_ptr->meditation) - { - msp += 50; - p_ptr->csp += 50; - } - /* Sp mods? */ mana_school_calc_mana(&msp); meta_inertia_control_calc_mana(&msp); @@ -2819,9 +2799,6 @@ void calc_bonuses(bool_ silent) /* Starts with single throwing damage */ p_ptr->throw_mult = 1; - /* Reset the "xtra" tval */ - p_ptr->tval_xtra = 0; - /* Reset the "ammo" tval */ p_ptr->tval_ammo = 0; @@ -3368,27 +3345,12 @@ void calc_bonuses(bool_ silent) p_ptr->dis_to_h += 15; } - /* Temporary "Meditation" */ - if (p_ptr->meditation) - { - p_ptr->to_d -= 25; - p_ptr->dis_to_d -= 25; - p_ptr->to_h -= 25; - p_ptr->dis_to_h -= 25; - } - /* Temporary "Reflection" */ if (p_ptr->tim_reflect) { p_ptr->reflect = TRUE; } - /* Temporary "Time Resistance" */ - if (p_ptr->tim_res_time) - { - p_ptr->resist_continuum = TRUE; - } - /* Temporary "Levitation" and "Flying" */ if (p_ptr->tim_ffall) { @@ -3399,12 +3361,6 @@ void calc_bonuses(bool_ silent) p_ptr->fly = TRUE; } - /* Temporary "Fire Aura" */ - if (p_ptr->tim_fire_aura) - { - p_ptr->sh_fire = TRUE; - } - /* Oppose Light & Dark */ if (p_ptr->oppose_ld) { @@ -3432,13 +3388,6 @@ void calc_bonuses(bool_ silent) p_ptr->resist_nexus = TRUE; } - /* Mental barrier */ - if (p_ptr->tim_mental_barrier) - { - p_ptr->sustain_int = TRUE; - p_ptr->sustain_wis = TRUE; - } - /* Temporary "fast" */ if (p_ptr->fast) { @@ -3527,10 +3476,6 @@ void calc_bonuses(bool_ silent) /* Searching slows the player down */ if (p_ptr->searching) p_ptr->pspeed -= 10; - /* In order to get a "nice" mana path druids need to ahve a 0 speed */ - if ((p_ptr->druid_extra2 == CLASS_MANA_PATH) && (p_ptr->pspeed > 110)) - p_ptr->pspeed = 110; - /* Display the speed (if needed) */ if (p_ptr->pspeed != old_speed) p_ptr->redraw |= (PR_FRAME); @@ -4164,7 +4109,6 @@ void update_stuff(void) if (p_ptr->update & (PU_SPELLS)) { p_ptr->update &= ~(PU_SPELLS); - calc_spells(); } if (p_ptr->update & (PU_POWERS)) diff --git a/src/xtra2.cc b/src/xtra2.cc index bd8e3736..4109ffcb 100644 --- a/src/xtra2.cc +++ b/src/xtra2.cc @@ -22,44 +22,6 @@ using boost::algorithm::iequals; -/* - * Invoke The Rush - */ -bool_ set_rush(int v) -{ - int j; - - /* Invoke The Bust */ - if (!v) - { - p_ptr->rush = 0; - - j = 50 - randint(p_ptr->lev); - set_paralyzed(j); - set_slow(j + 50 - randint(p_ptr->lev)); - return TRUE; - } - - /* When is The Bust going to happen? */ - p_ptr->rush = v; - - /* The bonuses of The Rush */ - set_hero(p_ptr->hero + v); - set_tim_deadly(p_ptr->tim_deadly + v); - set_strike(p_ptr->strike + v); - if (magik(p_ptr->lev / 2)) - { - set_light_speed(p_ptr->lightspeed + v); - } - else - { - set_fast(p_ptr->fast + v, 10); - } - if (magik(p_ptr->lev / 2)) set_tim_esp(p_ptr->tim_esp + v); - return TRUE; -} - - /* * Set "p_ptr->parasite" and "p_ptr->parasite_r_idx" * notice observable changes @@ -369,26 +331,6 @@ bool_ set_tim_fly(int v) TERM_WHITE, "You are suddenly a lot heavier."); } -/* - * Set "p_ptr->meditation" - */ -bool_ set_meditation(int v) -{ - bool_ notice = set_simple_field( - &p_ptr->meditation, v, - TERM_WHITE, "You start meditating on yourself...", - TERM_WHITE, "You stop your self meditation."); - - /* Recalculate bonuses */ - if (notice) - { - p_ptr->update |= (PU_MANA); - } - - /* Result */ - return notice; -} - /* * Set "p_ptr->tim_reflect" */ @@ -400,28 +342,6 @@ bool_ set_tim_reflect(int v) TERM_WHITE, "You stop reflecting."); } -/* - * Set "p_ptr->tim_res_time" - */ -bool_ set_tim_res_time(int v) -{ - return set_simple_field( - &p_ptr->tim_res_time, v, - TERM_WHITE, "You are now protected against space-time distortions.", - TERM_WHITE, "You are no longer protected against space-time distortions."); -} - -/* - * Set "p_ptr->tim_fire_aura" - */ -bool_ set_tim_fire_aura(int v) -{ - return set_simple_field( - &p_ptr->tim_fire_aura, v, - TERM_WHITE, "You are enveloped in flames.", - TERM_WHITE, "You are no longer enveloped in flames."); -} - /* * Set "p_ptr->strike" */ @@ -948,26 +868,6 @@ bool_ set_holy(int v) return notice; } -/* - * Set "p_ptr->walk_water", notice observable changes - */ -bool_ set_walk_water(int v) -{ - bool_ notice = set_simple_field( - &p_ptr->walk_water, v, - TERM_WHITE, "You feel strangely buoyant!", - TERM_WHITE, "You feel much less buoyant."); - - if (notice) - { - /* Handle stuff */ - handle_stuff(); - } - - /* Result */ - return notice; -} - /* * Set "p_ptr->shero", notice observable changes */ @@ -1246,26 +1146,6 @@ bool_ set_tim_infra(int v) } -/* - * Set "p_ptr->tim_mental_barrier", notice observable changes - */ -bool_ set_mental_barrier(int v) -{ - bool_ notice = set_simple_field( - &p_ptr->tim_mental_barrier, v, - TERM_WHITE, "Your mind grows stronger!", - TERM_WHITE, "Your mind is no longer especially strong."); - - if (notice) - { - /* Handle stuff */ - handle_stuff(); - } - - /* Result */ - return notice; -} - /* * Set "p_ptr->oppose_acid", notice observable changes */ -- cgit v1.2.3