diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-04-25 16:35:56 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-04-25 16:35:56 +0200 |
| commit | e8da5e6c01950dd649f90030a2c77654480e4369 (patch) | |
| tree | b8749886499f49f092be6362fe1e42bbabd53bfd /crawl-ref/source/ng-init.cc | |
| parent | b15ddc7bf0397d5034f0514c2d76e717da0819ba (diff) | |
| parent | fb959798448db7e13e6485f7fece472404f21f0e (diff) | |
| download | crawl-ref-e8da5e6c01950dd649f90030a2c77654480e4369.tar.gz crawl-ref-e8da5e6c01950dd649f90030a2c77654480e4369.zip | |
Merge branch 'master' into portal_branches
Diffstat (limited to 'crawl-ref/source/ng-init.cc')
| -rw-r--r-- | crawl-ref/source/ng-init.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/crawl-ref/source/ng-init.cc b/crawl-ref/source/ng-init.cc index 15d7ceb5e9..71eb94bff4 100644 --- a/crawl-ref/source/ng-init.cc +++ b/crawl-ref/source/ng-init.cc @@ -26,7 +26,7 @@ static uint8_t _random_potion_description() { - int desc, nature, colour; + int desc, colour; do { @@ -35,15 +35,12 @@ static uint8_t _random_potion_description() if (coinflip()) desc %= PDC_NCOLOURS; - nature = PQUAL(desc); colour = PCOLOUR(desc); // nature and colour correspond to primary and secondary in - // itemname.cc. This check ensures clear potions don't get odd - // qualifiers. + // itemname.cc. } - while (colour == PDC_CLEAR && nature > PDQ_VISCOUS - || desc == PDESCS(PDC_CLEAR)); + while (colour == PDC_CLEAR); // only water can be clear return desc; } @@ -274,6 +271,7 @@ void initialise_item_descriptions() you.item_description.init(255); you.item_description[IDESC_POTIONS][POT_WATER] = PDESCS(PDC_CLEAR); + set_ident_type(OBJ_POTIONS, POT_WATER, ID_KNOWN_TYPE); you.item_description[IDESC_POTIONS][POT_PORRIDGE] = _get_random_porridge_desc(); you.item_description[IDESC_POTIONS][POT_BLOOD] |