diff options
| author | Jude Brown <bookofjude@users.sourceforge.net> | 2009-12-02 15:34:37 +1000 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2009-12-02 15:34:37 +1000 |
| commit | c30b21d1404d7b78978af36466e21db785753188 (patch) | |
| tree | ed173e95db72d2e59b91077b5a6fa3a0b9f5e8f0 /crawl-ref/source/player.cc | |
| parent | cb8c1f9af8848ba60ed8ee2adca222c909ba52db (diff) | |
| download | crawl-ref-c30b21d1404d7b78978af36466e21db785753188.tar.gz crawl-ref-c30b21d1404d7b78978af36466e21db785753188.zip | |
Rename "wizard" to "wizard_tele" so it doesn't shadow player::wizard.
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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(); } |