diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-16 16:04:02 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-16 16:04:02 +0000 |
| commit | 54a744df62043fdc9eea179d42baa9b15281f346 (patch) | |
| tree | 894835600610d1e189fea635ec33ecb77a2173de /crawl-ref/source/ghost.cc | |
| parent | 173858bc3514e1de1c406400ff9b1f2261cea836 (diff) | |
| download | crawl-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/ghost.cc')
| -rw-r--r-- | crawl-ref/source/ghost.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc index b39895755d..c3861ef8a4 100644 --- a/crawl-ref/source/ghost.cc +++ b/crawl-ref/source/ghost.cc @@ -123,8 +123,6 @@ void ghost_demon::reset() see_invis = false; brand = SPWPN_NORMAL; resists = mon_resist_def(); - // HACKY: demons and ghosts always resist poison -// resists.poison = 1; spellcaster = false; cycle_colours = false; fly = FL_NONE; @@ -174,17 +172,19 @@ void ghost_demon::init_random_demon() if (!one_chance_in(3)) { - do { + do + { brand = static_cast<brand_type>( random2(MAX_PAN_LORD_BRANDS) ); /* some brands inappropriate (e.g. holy wrath) */ - } while (brand == SPWPN_HOLY_WRATH - || (brand == SPWPN_ORC_SLAYING - && you.mons_species() != MONS_ORC) - || (brand == SPWPN_DRAGON_SLAYING - && you.mons_species() != MONS_DRACONIAN) - || brand == SPWPN_PROTECTION - || brand == SPWPN_FLAME - || brand == SPWPN_FROST); + } + while (brand == SPWPN_HOLY_WRATH + || (brand == SPWPN_ORC_SLAYING + && you.mons_species() != MONS_ORC) + || (brand == SPWPN_DRAGON_SLAYING + && you.mons_species() != MONS_DRACONIAN) + || brand == SPWPN_PROTECTION + || brand == SPWPN_FLAME + || brand == SPWPN_FROST); } // is demon a spellcaster? |