summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/actor.h
diff options
context:
space:
mode:
authorJude Brown <bookofjude@users.sourceforge.net>2009-12-02 15:34:37 +1000
committerJude Brown <bookofjude@users.sourceforge.net>2009-12-02 15:34:37 +1000
commitc30b21d1404d7b78978af36466e21db785753188 (patch)
treeed173e95db72d2e59b91077b5a6fa3a0b9f5e8f0 /crawl-ref/source/actor.h
parentcb8c1f9af8848ba60ed8ee2adca222c909ba52db (diff)
downloadcrawl-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/actor.h')
-rw-r--r--crawl-ref/source/actor.h2
1 files changed, 1 insertions, 1 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;