diff options
author | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
commit | b06b5ca24b7a48bfa0fba6ba0032262e4e52b569 (patch) | |
tree | 42e72b72c9c03f87d97f47c8710fb27548e8fb4e | |
parent | cbcc1ba9ddafd8c2480e1c647d4b7b5f630bb63e (diff) |
Remove effectively unused player_type::oppose_* fields
-rw-r--r-- | src/dungeon.cc | 18 | ||||
-rw-r--r-- | src/loadsave.cc | 3 | ||||
-rw-r--r-- | src/player_type.hpp | 3 | ||||
-rw-r--r-- | src/xtra1.cc | 20 | ||||
-rw-r--r-- | src/xtra2.cc | 33 | ||||
-rw-r--r-- | src/xtra2.hpp | 3 |
6 files changed, 0 insertions, 80 deletions
diff --git a/src/dungeon.cc b/src/dungeon.cc index 824831cf..631a23e8 100644 --- a/src/dungeon.cc +++ b/src/dungeon.cc @@ -2213,30 +2213,12 @@ static void process_world(void) (void)set_oppose_pois(p_ptr->oppose_pois - 1); } - /* Oppose Light & Dark */ - if (p_ptr->oppose_ld) - { - (void)set_oppose_ld(p_ptr->oppose_ld - 1); - } - /* Oppose Chaos & Confusion */ if (p_ptr->oppose_cc) { (void)set_oppose_cc(p_ptr->oppose_cc - 1); } - /* Oppose Sound & Shards */ - if (p_ptr->oppose_ss) - { - (void)set_oppose_ss(p_ptr->oppose_ss - 1); - } - - /* Oppose Nexus */ - if (p_ptr->oppose_nex) - { - (void)set_oppose_nex(p_ptr->oppose_nex - 1); - } - /* Timed mimicry */ if (get_skill(SKILL_MIMICRY)) { diff --git a/src/loadsave.cc b/src/loadsave.cc index 292c80b6..f6a67093 100644 --- a/src/loadsave.cc +++ b/src/loadsave.cc @@ -742,10 +742,7 @@ static bool_ do_extra(ls_flag_t flag) do_s16b(&p_ptr->oppose_acid, flag); do_s16b(&p_ptr->oppose_elec, flag); do_s16b(&p_ptr->oppose_pois, flag); - do_s16b(&p_ptr->oppose_ld, flag); do_s16b(&p_ptr->oppose_cc, flag); - do_s16b(&p_ptr->oppose_ss, flag); - do_s16b(&p_ptr->oppose_nex, flag); do_s16b(&p_ptr->tim_esp, flag); do_s16b(&p_ptr->tim_wraith, flag); diff --git a/src/player_type.hpp b/src/player_type.hpp index fdaab57a..684a086e 100644 --- a/src/player_type.hpp +++ b/src/player_type.hpp @@ -128,10 +128,7 @@ struct player_type s16b oppose_fire = 0; /* Timed -- oppose heat */ s16b oppose_cold = 0; /* Timed -- oppose cold */ s16b oppose_pois = 0; /* Timed -- oppose poison */ - s16b oppose_ld = 0; /* Timed -- oppose light & dark */ s16b oppose_cc = 0; /* Timed -- oppose chaos & confusion */ - s16b oppose_ss = 0; /* Timed -- oppose sound & shards */ - s16b oppose_nex = 0; /* Timed -- oppose nexus */ s16b tim_esp = 0; /* Timed ESP */ s16b tim_wraith = 0; /* Timed wraithform */ diff --git a/src/xtra1.cc b/src/xtra1.cc index ae37bd90..c7fd9213 100644 --- a/src/xtra1.cc +++ b/src/xtra1.cc @@ -3409,13 +3409,6 @@ void calc_bonuses(bool_ silent) p_ptr->fly = TRUE; } - /* Oppose Light & Dark */ - if (p_ptr->oppose_ld) - { - p_ptr->resist_lite = TRUE; - p_ptr->resist_dark = TRUE; - } - /* Oppose Chaos & Confusion */ if (p_ptr->oppose_cc) { @@ -3423,19 +3416,6 @@ void calc_bonuses(bool_ silent) p_ptr->resist_conf = TRUE; } - /* Oppose Sound & Shards */ - if (p_ptr->oppose_ss) - { - p_ptr->resist_sound = TRUE; - p_ptr->resist_shard = TRUE; - } - - /* Oppose Nexus */ - if (p_ptr->oppose_nex) - { - p_ptr->resist_nexus = TRUE; - } - /* Temporary "fast" */ if (p_ptr->fast) { diff --git a/src/xtra2.cc b/src/xtra2.cc index 03c04587..b00a6802 100644 --- a/src/xtra2.cc +++ b/src/xtra2.cc @@ -403,17 +403,6 @@ bool_ set_strike(int v) } /* - * Set "p_ptr->oppose_ld" - */ -bool_ set_oppose_ld(int v) -{ - return set_simple_field( - &p_ptr->oppose_ld, v, - TERM_WHITE, "You feel protected against light's fluctuation.", - TERM_WHITE, "You are no longer protected against light's fluctuation."); -} - -/* * Set "p_ptr->oppose_cc" */ bool_ set_oppose_cc(int v) @@ -425,28 +414,6 @@ bool_ set_oppose_cc(int v) } /* - * Set "p_ptr->oppose_ss" - */ -bool_ set_oppose_ss(int v) -{ - return set_simple_field( - &p_ptr->oppose_ss, v, - TERM_WHITE, "You feel protected against the ravages of sound and shards.", - TERM_WHITE, "You are no longer protected against the ravages of sound and shards."); -} - -/* - * Set "p_ptr->oppose_nex" - */ -bool_ set_oppose_nex(int v) -{ - return set_simple_field( - &p_ptr->oppose_nex, v, - TERM_WHITE, "You feel protected against the strange forces of nexus.", - TERM_WHITE, "You are no longer protected against the strange forces of nexus."); -} - -/* * Set "p_ptr->tim_mimic", and "p_ptr->mimic_form", * notice observable changes */ diff --git a/src/xtra2.hpp b/src/xtra2.hpp index 5d9d26f5..5ab6860c 100644 --- a/src/xtra2.hpp +++ b/src/xtra2.hpp @@ -58,10 +58,7 @@ extern bool_ set_oppose_elec(int v); extern bool_ set_oppose_fire(int v); extern bool_ set_oppose_cold(int v); extern bool_ set_oppose_pois(int v); -extern bool_ set_oppose_ld(int v); extern bool_ set_oppose_cc(int v); -extern bool_ set_oppose_ss(int v); -extern bool_ set_oppose_nex(int v); extern bool_ set_stun(int v); extern bool_ set_cut(int v); extern bool_ set_food(int v); |