summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells3.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/spells3.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/spells3.h')
-rw-r--r--crawl-ref/source/spells3.h4
1 files changed, 3 insertions, 1 deletions
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