diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-12-27 17:48:37 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-27 17:48:37 +0100 |
| commit | 42d227a273a1334b60ca7574a8127d1a4b2744a1 (patch) | |
| tree | 2655bcdeab4c1e157906b88ccefdda7645ee580a /crawl-ref/source/main.cc | |
| parent | 5b7701dc9d19fdad4de1a64b41995d65c03b7df6 (diff) | |
| parent | dc3e12a4da48363a7cadb77f30b8e784d5f82acf (diff) | |
| download | crawl-ref-42d227a273a1334b60ca7574a8127d1a4b2744a1.tar.gz crawl-ref-42d227a273a1334b60ca7574a8127d1a4b2744a1.zip | |
Merge branch 'master' into iood
Diffstat (limited to 'crawl-ref/source/main.cc')
| -rw-r--r-- | crawl-ref/source/main.cc | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc index 2a68a7f624..7f3ccb2592 100644 --- a/crawl-ref/source/main.cc +++ b/crawl-ref/source/main.cc @@ -533,8 +533,8 @@ static void _do_wizard_command(int wiz_command, bool silent_fail) case 'I': wizard_unidentify_pack(); break; case 'Z': case 'z': wizard_cast_spec_spell(); break; - case '(': wizard_create_feature_number(); break; - case ')': wizard_create_feature_name(); break; + case '(': + case ')': wizard_create_feature(); break; case ':': wizard_list_branches(); break; case '{': wizard_map_level(); break; case '}': wizard_reveal_traps(); break; @@ -1296,6 +1296,12 @@ static void _go_upstairs() if (_marker_vetoes_stair()) return; + if (you.duration[DUR_MISLED]) + { + mpr("Away from their source, illusions no longer mislead you.", MSGCH_DURATION); + you.duration[DUR_MISLED] = 0; + } + tag_followers(); // Only those beside us right now can follow. start_delay(DELAY_ASCENDING_STAIRS, 1 + (you.burden_state > BS_UNENCUMBERED)); @@ -1367,6 +1373,12 @@ static void _go_downstairs() if (!check_annotation_exclusion_warning()) return; + if (you.duration[DUR_MISLED]) + { + mpr("Away from their source, illusions no longer mislead you.", MSGCH_DURATION); + you.duration[DUR_MISLED] = 0; + } + if (shaft) { start_delay( DELAY_DESCENDING_STAIRS, 0, you.your_level ); @@ -2427,6 +2439,7 @@ static void _decrement_durations() _decrement_a_duration(DUR_LOWERED_MR, delay, "You feel more resistant to magic."); _decrement_a_duration(DUR_SLIMIFY, delay, "You feel less slimy.", coinflip(), "Your slime is starting to congeal."); + _decrement_a_duration(DUR_MISLED, delay, "Your thoughts are your own once more."); if (you.duration[DUR_PARALYSIS] || you.petrified()) { @@ -4618,7 +4631,7 @@ static void _compile_time_asserts() COMPILE_CHECK(SP_VAMPIRE == 30 , c3); COMPILE_CHECK(SPELL_DEBUGGING_RAY == 103 , c4); COMPILE_CHECK(SPELL_RETURNING_AMMUNITION == 162 , c5); - COMPILE_CHECK(NUM_SPELLS == 212 , c6); + COMPILE_CHECK(NUM_SPELLS == 216 , c6); //jmf: NEW ASSERTS: we ought to do a *lot* of these COMPILE_CHECK(NUM_SPECIES < SP_UNKNOWN , c7); |