diff options
| -rw-r--r-- | crawl-ref/source/acr.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/it_use2.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/spells3.cc | 40 | ||||
| -rw-r--r-- | crawl-ref/source/spells3.h | 1 |
6 files changed, 2 insertions, 66 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index f1dd7eef3e..4fbcfe8081 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -2858,11 +2858,7 @@ static void _decrement_durations() if (you.duration[DUR_BACKLIGHT] > 0 && !--you.duration[DUR_BACKLIGHT] && !you.backlit()) { - // An invisible player inside a halo doesn't lose backlight. - if (you.duration[DUR_INVIS] && halo_radius()) - you.duration[DUR_BACKLIGHT] = 1; - else - mpr("You are no longer glowing.", MSGCH_DURATION); + mpr("You are no longer glowing.", MSGCH_DURATION); } // Leak piety from the piety pool into actual piety. @@ -3053,8 +3049,6 @@ static void _world_reacts() _check_sanctuary(); - manage_halo(); - run_environment_effects(); if ( !you.cannot_act() && !player_mutation_level(MUT_BLURRY_VISION) diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc index ce0aea3077..9a77a2cc7c 100644 --- a/crawl-ref/source/it_use2.cc +++ b/crawl-ref/source/it_use2.cc @@ -245,10 +245,6 @@ bool potion_effect( potion_type pot_eff, int pow, bool was_known ) you.duration[DUR_INVIS] = 100; you.duration[DUR_BACKLIGHT] = 0; - - // Invisible players inside a halo get backlight. - if (halo_radius()) - manage_halo(); break; case POT_PORRIDGE: // oatmeal - always gluggy white/grey? diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 2831ff1298..04266ee9d0 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -4238,10 +4238,6 @@ bool monsters::add_ench(const mon_enchant &ench) if (new_enchantment) add_enchantment_effect(ench); - // Invisible monsters inside a halo get backlight. - if (inside_halo(x, y)) - manage_halo(); - return (true); } @@ -4388,10 +4384,7 @@ void monsters::remove_enchantment_effect(const mon_enchant &me, bool quiet) break; case ENCH_BACKLIGHT: - // invisible monsters inside a halo don't lose backlight - if (has_ench(ENCH_INVIS) && inside_halo(x, y)) - add_ench(mon_enchant(ENCH_BACKLIGHT, 0, KC_YOU, 10)); - else if (!quiet) + if (!quiet) { if (player_monster_visible(this)) simple_monster_message(this, " stops glowing."); diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index e4a0723dee..438d09d89b 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -433,7 +433,6 @@ void dec_penance(god_type god, int val) && you.piety >= piety_breakpoint(0)) { mpr("Your divine halo begins to return!"); - manage_halo(); } // bonuses now once more effective @@ -483,7 +482,6 @@ static void _inc_penance(god_type god, int val) { if (halo_radius()) mpr("Your divine halo begins to fade."); - manage_halo(); if (you.duration[DUR_DIVINE_SHIELD]) { @@ -2355,10 +2353,7 @@ mprf(MSGCH_DIAGNOSTICS, "Piety increasing by %d (and %d taken from hysteresis)", if (you.religion == GOD_SHINING_ONE) { if (i == 0) - { mpr("A divine halo begins to surround you!"); - manage_halo(); - } } // When you gain a piety level, you get another chance to @@ -4007,7 +4002,6 @@ void excommunication(god_type new_god) case GOD_SHINING_ONE: if (old_halo) mpr("Your divine halo begins to fade."); - manage_halo(); if (you.duration[DUR_DIVINE_SHIELD]) { diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 1220fe5d90..ae14dbc0f9 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -1052,46 +1052,6 @@ int halo_radius() return 0; } -void manage_halo() -{ - int radius = halo_radius(); - - if (radius == 0) - return; - - int monster = -1; - - // Backlight an invisible player inside a halo. - if (you.duration[DUR_INVIS] && !you.duration[DUR_BACKLIGHT]) - you.duration[DUR_BACKLIGHT] = 1; - - for (int x = -radius; x <= radius; x++) - for (int y = -radius; y <= radius; y++) - { - int posx = you.x_pos + x; - int posy = you.y_pos + y; - int dist = _inside_circle(posx, posy, radius); - - if (dist != -1) - { - monster = mgrd[posx][posy]; - - // Backlight invisible monsters inside a halo. - if (monster != NON_MONSTER) - { - monsters *mon = &menv[monster]; - - if (mon->has_ench(ENCH_INVIS) - && !mon->has_ench(ENCH_BACKLIGHT)) - { - mon->add_ench(mon_enchant(ENCH_BACKLIGHT, 0, - KC_YOU, 10)); - } - } - } - } -} - bool inside_halo(int posx, int posy) { return (_inside_circle(posx, posy, halo_radius()) != -1); diff --git a/crawl-ref/source/spells3.h b/crawl-ref/source/spells3.h index 87ae6b6d5b..e8fc4bf846 100644 --- a/crawl-ref/source/spells3.h +++ b/crawl-ref/source/spells3.h @@ -69,7 +69,6 @@ bool remove_sanctuary(bool did_attack = false); void decrease_sanctuary_radius(void); bool cast_sanctuary(const int power); int halo_radius(void); -void manage_halo(void); bool inside_halo(int posx, int posy); // updated 24may2000 {dlb} |