summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/menu.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-16 16:04:02 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-16 16:04:02 +0000
commit54a744df62043fdc9eea179d42baa9b15281f346 (patch)
tree894835600610d1e189fea635ec33ecb77a2173de /crawl-ref/source/menu.cc
parent173858bc3514e1de1c406400ff9b1f2261cea836 (diff)
downloadcrawl-ref-54a744df62043fdc9eea179d42baa9b15281f346.tar.gz
crawl-ref-54a744df62043fdc9eea179d42baa9b15281f346.zip
Disallow the Staff of Wucad Mu as a Trog gift.
And another of those code cleanups. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4259 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/menu.cc')
-rw-r--r--crawl-ref/source/menu.cc16
1 files changed, 12 insertions, 4 deletions
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc
index 1a47b5a3a5..2e6e291001 100644
--- a/crawl-ref/source/menu.cc
+++ b/crawl-ref/source/menu.cc
@@ -1094,18 +1094,26 @@ void slider_menu::new_selection(int nsel)
if (nsel < 0)
{
if ( !is_set(MF_NOWRAP) )
- do {
+ {
+ do
+ {
nsel += items.size();
- } while ( nsel < 0 );
+ }
+ while ( nsel < 0 );
+ }
else
nsel = 0;
}
if (nsel >= static_cast<int>(items.size()))
{
if ( !is_set(MF_NOWRAP) )
- do {
+ {
+ do
+ {
nsel -= items.size();
- } while ( nsel >= static_cast<int>(items.size()) );
+ }
+ while ( nsel >= static_cast<int>(items.size()) );
+ }
else
nsel = items.size() - 1;
}