summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ng-init.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2012-11-14 01:10:01 +0100
committerAdam Borowski <kilobyte@angband.pl>2012-11-16 09:38:01 +0100
commit5eac9c1a3e4eeda4fc437bf3c0ec6c6426d42118 (patch)
tree5a8c4b8ffefe682a6b797fcf96d637f1b48cedf4 /crawl-ref/source/ng-init.cc
parentc2d162733a7725347f5ea1d1ed043e8ba1bb3e8a (diff)
downloadcrawl-ref-5eac9c1a3e4eeda4fc437bf3c0ec6c6426d42118.tar.gz
crawl-ref-5eac9c1a3e4eeda4fc437bf3c0ec6c6426d42118.zip
Remove generation logic for amulets of controlled fly.
It'd break when save compat is bumped. Also, clean up a warning for clear potions.
Diffstat (limited to 'crawl-ref/source/ng-init.cc')
-rw-r--r--crawl-ref/source/ng-init.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/ng-init.cc b/crawl-ref/source/ng-init.cc
index 662bf5bbb0..9b63f89cdb 100644
--- a/crawl-ref/source/ng-init.cc
+++ b/crawl-ref/source/ng-init.cc
@@ -28,20 +28,18 @@
static uint8_t _random_potion_description()
{
- int desc, colour;
+ int desc;
desc = random2(PDQ_NQUALS * PDC_NCOLOURS);
if (coinflip())
desc %= PDC_NCOLOURS;
- colour = PCOLOUR(desc);
-
// nature and colour correspond to primary and secondary in
// itemname.cc.
#if TAG_MAJOR_VERSION == 34
- if (colour == PDC_CLEAR) // only water can be clear, re-roll
+ if (PCOLOUR(desc) == PDC_CLEAR) // only water can be clear, re-roll
return _random_potion_description();
#endif