diff options
author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-25 12:02:00 -0500 |
---|---|---|
committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-25 12:02:00 -0500 |
commit | 4a5e01f14246459a435ebb92514ad5444dd6f2c3 (patch) | |
tree | 6dc5775f07138223305ffb51e8c54c65088718f0 /crawl-ref | |
parent | 4b6064557297acb3fc1fa967d6124fa50be48836 (diff) | |
download | crawl-ref-4a5e01f14246459a435ebb92514ad5444dd6f2c3.tar.gz crawl-ref-4a5e01f14246459a435ebb92514ad5444dd6f2c3.zip |
Add yet more minor cosmetic fixes.
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/spells1.cc | 8 | ||||
-rw-r--r-- | crawl-ref/source/spells3.cc | 22 |
2 files changed, 15 insertions, 15 deletions
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 7cc35a178c..28104ddb94 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -1162,12 +1162,12 @@ void antimagic() if (!you.permanent_flight() && you.duration[DUR_CONTROLLED_FLIGHT] > 1) you.duration[DUR_CONTROLLED_FLIGHT] = 1; - for ( unsigned int i = 0; i < ARRAYSZ(dur_list); ++i ) - if ( you.duration[dur_list[i]] > 1 ) + for (unsigned int i = 0; i < ARRAYSZ(dur_list); ++i) + if (you.duration[dur_list[i]] > 1) you.duration[dur_list[i]] = 1; - contaminate_player( -1 * (1 + random2(5))); -} // end antimagic() + contaminate_player(-1 * (1 + random2(5))); +} void extension(int pow) { diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index cf32fb3905..83f58fbb99 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -1406,11 +1406,11 @@ static bool _teleport_player( bool allow_control, bool new_abyss_area ) } else { - // Controlling teleport contaminates the player. -- bwr + // Controlling teleport contaminates the player. - bwr contaminate_player(1, true); } } - } // end "if is_controlled" + } if (!is_controlled) { @@ -2032,13 +2032,13 @@ bool recall(char type_recalled) mpr("Nothing appears to have answered your call."); return (success); -} // end recall() +} // Restricted to main dungeon for historical reasons, probably for // balance: otherwise you have an instant teleport from anywhere. int portal() { - if (!player_in_branch( BRANCH_MAIN_DUNGEON )) + if (!player_in_branch(BRANCH_MAIN_DUNGEON)) { mpr("This spell doesn't work here."); return (-1); @@ -2050,9 +2050,9 @@ int portal() } else if (you.char_direction == GDT_ASCENDING) { - // be evil if you've got the Orb + // Be evil if you've got the Orb. mpr("An empty arch forms before you, then disappears."); - return 1; + return (1); } mpr("Which direction ('<' for up, '>' for down, 'x' to quit)? ", @@ -2087,13 +2087,13 @@ int portal() } } - mpr("How many levels (1 - 9, 'x' to quit)? ", MSGCH_PROMPT); + mpr("How many levels (1-9, 'x' to quit)? ", MSGCH_PROMPT); int amount = 0; while (amount == 0) { const int keyin = getch(); - if ( isdigit(keyin) ) + if (isdigit(keyin)) amount = (keyin - '0') * dir_sign; else if (keyin == 'x') { @@ -2102,13 +2102,13 @@ int portal() } } - mpr( "You fall through a mystic portal, and materialise at the " - "foot of a staircase." ); + mpr("You fall through a mystic portal, and materialise at the " + "foot of a staircase."); more(); const int old_level = you.your_level; you.your_level = std::max(0, std::min(26, you.your_level + amount)) - 1; - down_stairs( old_level, DNGN_STONE_STAIRS_DOWN_I ); + down_stairs(old_level, DNGN_STONE_STAIRS_DOWN_I); return (1); } |