diff options
| -rw-r--r-- | crawl-ref/source/actor.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/monster.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/player.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-mon/animals/giant_leech.png | bin | 0 -> 1199 bytes | |||
| -rw-r--r-- | crawl-ref/source/spells3.cc | 19 | ||||
| -rw-r--r-- | crawl-ref/source/spells3.h | 4 |
7 files changed, 18 insertions, 15 deletions
diff --git a/crawl-ref/source/actor.h b/crawl-ref/source/actor.h index 4d2fa2834d..f8e920eb14 100644 --- a/crawl-ref/source/actor.h +++ b/crawl-ref/source/actor.h @@ -155,7 +155,7 @@ public: virtual void blink(bool allow_partial_control = true) = 0; virtual void teleport(bool right_now = false, bool abyss_shift = false, - bool wizard = false) = 0; + bool wizard_tele = false) = 0; virtual void poison(actor *attacker, int amount = 1) = 0; virtual bool sicken(int amount) = 0; virtual void paralyse(actor *attacker, int strength) = 0; diff --git a/crawl-ref/source/monster.h b/crawl-ref/source/monster.h index 8a34cba2e1..c17aeee6ce 100644 --- a/crawl-ref/source/monster.h +++ b/crawl-ref/source/monster.h @@ -384,7 +384,7 @@ public: void blink(bool allow_partial_control = true); void teleport(bool right_now = false, bool abyss_shift = false, - bool wizard = false); + bool wizard_tele = false); void hibernate(int power = 0); void check_awaken(int disturbance); diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index fbb5d402e0..a83fffad66 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6651,12 +6651,12 @@ void player::blink(bool allow_partial_control) random_blink(allow_partial_control); } -void player::teleport(bool now, bool abyss_shift, bool wizard) +void player::teleport(bool now, bool abyss_shift, bool wizard_tele) { ASSERT(!crawl_state.arena); if (now) - you_teleport_now(true, abyss_shift, wizard); + you_teleport_now(true, abyss_shift, wizard_tele); else you_teleport(); } diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h index 0e1376bd78..9b2960a644 100644 --- a/crawl-ref/source/player.h +++ b/crawl-ref/source/player.h @@ -428,7 +428,7 @@ public: void blink(bool allow_partial_control = true); void teleport(bool right_now = false, bool abyss_shift = false, - bool wizard = false); + bool wizard_tele = false); void drain_stat(int stat, int amount, actor* attacker); void expose_to_element(beam_type element, int strength = 0); diff --git a/crawl-ref/source/rltiles/dc-mon/animals/giant_leech.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_leech.png Binary files differnew file mode 100644 index 0000000000..82a6822ed3 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_leech.png diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index f612a1708b..75f12203a8 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -1410,17 +1410,17 @@ void you_teleport(void) } } -static bool _teleport_player(bool allow_control, bool new_abyss_area, bool wizard) +static bool _teleport_player(bool allow_control, bool new_abyss_area, bool wizard_tele) { bool is_controlled = (allow_control && !you.confused() && player_control_teleport() && allow_control_teleport()); // All wizard teleports are automatically controlled. - if (wizard) + if (wizard_tele) is_controlled = true; - if (scan_artefacts(ARTP_PREVENT_TELEPORTATION) && !wizard) + if (scan_artefacts(ARTP_PREVENT_TELEPORTATION) && !wizard_tele) { mpr("You feel a strange sense of stasis."); return (false); @@ -1462,7 +1462,7 @@ static bool _teleport_player(bool allow_control, bool new_abyss_area, bool wizar check_ring_TC = true; // Only have the more prompt for non-wizard. - if (!wizard) + if (!wizard_tele) more(); while (true) @@ -1511,7 +1511,7 @@ static bool _teleport_player(bool allow_control, bool new_abyss_area, bool wizar } // Don't randomly walk wizard teleports. - if (!wizard) + if (!wizard_tele) { pos.x += random2(3) - 1; pos.y += random2(3) - 1; @@ -1553,7 +1553,7 @@ static bool _teleport_player(bool allow_control, bool new_abyss_area, bool wizar is_controlled = false; large_change = false; } - else if (testbits(env.pgrid(pos), FPROP_NO_CTELE_INTO) && !wizard) + else if (testbits(env.pgrid(pos), FPROP_NO_CTELE_INTO) && !wizard_tele) { is_controlled = false; large_change = false; @@ -1566,7 +1566,7 @@ static bool _teleport_player(bool allow_control, bool new_abyss_area, bool wizar // Controlling teleport contaminates the player. - bwr move_player_to_grid(pos, false, true, true); - if (!wizard) + if (!wizard_tele) contaminate_player(1, true); } } @@ -1668,9 +1668,10 @@ static bool _teleport_player(bool allow_control, bool new_abyss_area, bool wizar return (!is_controlled); } -void you_teleport_now(bool allow_control, bool new_abyss_area, bool wizard) +void you_teleport_now(bool allow_control, bool new_abyss_area, bool wizard_tele) { - const bool randtele = _teleport_player(allow_control, new_abyss_area, wizard); + const bool randtele = _teleport_player(allow_control, new_abyss_area, + wizard_tele); // Xom is amused by uncontrolled teleports that land you in a // dangerous place, unless the player is in the Abyss and diff --git a/crawl-ref/source/spells3.h b/crawl-ref/source/spells3.h index 0721dc9b83..3d9d899ad5 100644 --- a/crawl-ref/source/spells3.h +++ b/crawl-ref/source/spells3.h @@ -63,7 +63,9 @@ bool cast_haunt(int pow, const coord_def& where, god_type god = GOD_NO_GOD); bool cast_death_channel(int pow, god_type god = GOD_NO_GOD); void you_teleport(); -void you_teleport_now(bool allow_control, bool new_abyss_area = false, bool wizard = false); +void you_teleport_now(bool allow_control, + bool new_abyss_area = false, + bool wizard_tele = false); #endif |
