diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-28 23:00:12 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-28 23:00:12 +0000 |
commit | ca1e897a646bb9c098a1fc651a3b4aa6c976ddc7 (patch) | |
tree | dbf6313bff2e2906a4f9ee61fdefff8594849522 /crawl-ref/source/player.cc | |
parent | 0f8c8527e5a685509462e0990a7b6ec6595e445a (diff) | |
download | crawl-ref-ca1e897a646bb9c098a1fc651a3b4aa6c976ddc7.tar.gz crawl-ref-ca1e897a646bb9c098a1fc651a3b4aa6c976ddc7.zip |
Apply r6640, r6694 (both by Darshan), r6670 (Haran), r6679 and r6703
(me) to branch.
Includes TSO no longer granting permanent allies and resultant friendly
pickup change, and a number of smaller changes.
Also update change log.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6709 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r-- | crawl-ref/source/player.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 2f3ab09187..fc5a0076fc 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6765,7 +6765,7 @@ void PlaceInfo::make_global() branch = -1; } -void PlaceInfo::assert_validity() +void PlaceInfo::assert_validity() const { // Check that level_type and branch match up. ASSERT(is_global() @@ -6777,10 +6777,10 @@ void PlaceInfo::assert_validity() #if DEBUG // Can't have visited a place without seeing any of its levels, and // vice versa. - if(!(num_visits == 0 && levels_seen == 0 - || num_visits > 0 && levels_seen > 0)) + if (!(num_visits == 0 && levels_seen == 0 + || num_visits > 0 && levels_seen > 0)) { - mprf(MSGCH_DIAGNOSTICS, "PlaceInfo: num_vists/levels_seen mismatch"); + mprf(MSGCH_DIAGNOSTICS, "PlaceInfo: num_visits/levels_seen mismatch"); num_visits = std::max((unsigned long) 1, num_visits); levels_seen = std::max((unsigned long) 1, levels_seen); } @@ -6814,8 +6814,8 @@ void PlaceInfo::assert_validity() } } - if(turns_total != (turns_explore + turns_travel + turns_interlevel - + turns_resting + turns_other)) + if (turns_total != (turns_explore + turns_travel + turns_interlevel + + turns_resting + turns_other)) { mprf(MSGCH_DIAGNOSTICS, "PlaceInfo: turns breakdown doesn't sum " "up properly."); @@ -6823,8 +6823,8 @@ void PlaceInfo::assert_validity() + turns_resting + turns_other); } - if(elapsed_total != (elapsed_explore + elapsed_travel + elapsed_interlevel - + elapsed_resting + elapsed_other)) + if (elapsed_total != (elapsed_explore + elapsed_travel + elapsed_interlevel + + elapsed_resting + elapsed_other)) { mprf(MSGCH_DIAGNOSTICS, "PlaceInfo: elapsed time breakdown doesn't " "sum up properly."); |