diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-15 17:01:48 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-15 17:01:48 +0000 |
commit | a5f8b4aaccf99929024188fb2253f1fa2b6b3f44 (patch) | |
tree | 5b9f5df4951f2217c6367cdbd0e723dc97674d21 /crawl-ref/source/terrain.cc | |
parent | cf4b68bb3c2e5d1955d41fff7284a7d56a484b3f (diff) | |
download | crawl-ref-a5f8b4aaccf99929024188fb2253f1fa2b6b3f44.tar.gz crawl-ref-a5f8b4aaccf99929024188fb2253f1fa2b6b3f44.zip |
Lots more cleanups.
Remove the sound-strength #defines because they're not used anymore (except
for SL_SPLASH, which has been replaced by its value.)
Change some #defines to const variables.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9087 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/terrain.cc')
-rw-r--r-- | crawl-ref/source/terrain.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc index a893869834..88fa5905b2 100644 --- a/crawl-ref/source/terrain.cc +++ b/crawl-ref/source/terrain.cc @@ -323,8 +323,8 @@ void get_door_description(int door_size, const char** adjective, const char** no "huge " , "gate", }; - const unsigned int idx = MIN( (unsigned int) door_size*2, - ARRAYSZ(descriptions) - 2 ); + const unsigned int idx = std::min(static_cast<unsigned int>(door_size*2), + ARRAYSZ(descriptions) - 2); *adjective = descriptions[idx]; *noun = descriptions[idx+1]; } |