summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-act.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-12 08:33:22 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-12 09:38:24 +0100
commit9f7066eab03883b18610a629a3a84731cd26ca13 (patch)
tree46a9727513639d1e952aaa8ae0c2bf4fb2e4ef09 /crawl-ref/source/mon-act.cc
parent62a3121fcb79a591a6d7310dfa3b394a85bb54e5 (diff)
downloadcrawl-ref-9f7066eab03883b18610a629a3a84731cd26ca13.tar.gz
crawl-ref-9f7066eab03883b18610a629a3a84731cd26ca13.zip
Use get_free_monster in other places.
Diffstat (limited to 'crawl-ref/source/mon-act.cc')
-rw-r--r--crawl-ref/source/mon-act.cc16
1 files changed, 4 insertions, 12 deletions
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index 1ca78665b2..08993ab449 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -2128,18 +2128,10 @@ static bool _jelly_divide(monsters *parent)
if ( num_spots == 0 )
return (false);
- int k = 0;
-
// Now that we have a spot, find a monster slot {dlb}:
- for (k = 0; k < MAX_MONSTERS; k++)
- {
- child = &menv[k];
-
- if (child->type == -1)
- break;
- else if (k == MAX_MONSTERS - 1)
- return (false);
- }
+ child = get_free_monster();
+ if (!child)
+ return (false);
// Handle impact of split on parent {dlb}:
parent->max_hit_points /= 2;
@@ -2158,7 +2150,7 @@ static bool _jelly_divide(monsters *parent)
child->speed_increment = 70 + random2(5);
child->moveto(child_spot);
- mgrd(child->pos()) = k;
+ mgrd(child->pos()) = child->mindex();
if (!simple_monster_message(parent, " splits in two!"))
if (player_can_hear(parent->pos()) || player_can_hear(child->pos()))