diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-08 23:54:03 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-08 23:54:03 -0600 |
| commit | 2a25d30006b0f27af85b88a847dfad11a233026e (patch) | |
| tree | c4545953ccd9cb0059f1e04e53ada17738b4ae07 /crawl-ref/source/mon-cast.cc | |
| parent | cf7c04f8ec07659483181d1b107eeff75c94db7a (diff) | |
| download | crawl-ref-2a25d30006b0f27af85b88a847dfad11a233026e.tar.gz crawl-ref-2a25d30006b0f27af85b88a847dfad11a233026e.zip | |
Simplify.
Diffstat (limited to 'crawl-ref/source/mon-cast.cc')
| -rw-r--r-- | crawl-ref/source/mon-cast.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index b2a7d34160..873f7275c9 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -1889,7 +1889,7 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, } return; - // Journey -- Added in Summon Lizards and Draconian + // Journey -- Added in Summon Lizards and Draconians case SPELL_SUMMON_DRAKES: if (_mons_abjured(monster, monsterNearby)) return; @@ -1901,18 +1901,21 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, { std::vector<monster_type> monsters; - for (sumcount = 0; sumcount < sumcount2; sumcount++) + for (sumcount = 0; sumcount < sumcount2; ++sumcount) { + bool drag = false; monster_type mon = summon_any_dragon(DRAGON_LIZARD); if (mon == MONS_DRAGON) { - monsters.clear(); - monsters.push_back(summon_any_dragon(DRAGON_DRAGON)); - break; + drag = true; + mon = summon_any_dragon(DRAGON_DRAGON); } monsters.push_back(mon); + + if (drag) + break; } for (int i = 0, size = monsters.size(); i < size; ++i) |