diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-23 14:21:09 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-23 14:21:09 +0000 |
| commit | df39d45725b62feba8dbc81496902161ddb9f3ef (patch) | |
| tree | d1b50d84c8852c7e0af92cee6c2ac53bbbbbc6c6 /crawl-ref/source/spells3.cc | |
| parent | f6859509007cd7fbc7b744dd74c319456acf2a48 (diff) | |
| download | crawl-ref-df39d45725b62feba8dbc81496902161ddb9f3ef.tar.gz crawl-ref-df39d45725b62feba8dbc81496902161ddb9f3ef.zip | |
Lots of things which used to be members (invis, conf, confusing_touch, etc.)
are now durations.
Removed some unnecessary limitations.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1626 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells3.cc')
| -rw-r--r-- | crawl-ref/source/spells3.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 503c967aa4..1dfec6784e 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -304,7 +304,7 @@ void sublimation(int power) || you.inv[you.equip[EQ_WEAPON]].base_type != OBJ_FOOD || you.inv[you.equip[EQ_WEAPON]].sub_type != FOOD_CHUNK) { - if (you.deaths_door) + if (you.duration[DUR_DEATHS_DOOR]) { mpr( "A conflicting enchantment prevents the spell from " "coming into effect." ); @@ -593,7 +593,7 @@ void you_teleport(void) static bool teleport_player( bool allow_control, bool new_abyss_area ) { - bool is_controlled = (allow_control && !you.conf + bool is_controlled = (allow_control && !you.duration[DUR_CONF] && player_control_teleport() && allow_control_teleport()); |