From acb00a7d955a7e356ef3d63f29cf9c7db6c7e817 Mon Sep 17 00:00:00 2001 From: Steve Date: Fri, 9 Feb 2018 08:38:02 +0000 Subject: [PATCH] Grenade droid init fixes. --- src/entities/eyeDroids/grenadeDroid.c | 10 +++++++++- src/entities/eyeDroids/grenadeDroid.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/entities/eyeDroids/grenadeDroid.c b/src/entities/eyeDroids/grenadeDroid.c index 095674e..29cc77f 100644 --- a/src/entities/eyeDroids/grenadeDroid.c +++ b/src/entities/eyeDroids/grenadeDroid.c @@ -24,10 +24,16 @@ static void (*superPreFire)(void); static void preFire(void); static int canFire(Entity *target); -void initGrenadeDroid(Unit *u) +Entity *initGrenadeDroid(void) { + Unit *u; + + u = createUnit(); + initEyeDroid(u); + u->unitType = "GrenadeEyeDroid"; + u->sprite[FACING_LEFT] = getSprite("GrenadeDroidLeft"); u->sprite[FACING_RIGHT] = getSprite("GrenadeDroidRight"); u->sprite[FACING_DIE] = getSprite("GrenadeDroidDie"); @@ -38,6 +44,8 @@ void initGrenadeDroid(Unit *u) u->preFire = preFire; u->canFire = canFire; + + return (Entity*)u; } static void preFire(void) diff --git a/src/entities/eyeDroids/grenadeDroid.h b/src/entities/eyeDroids/grenadeDroid.h index 02adbcd..b83685e 100644 --- a/src/entities/eyeDroids/grenadeDroid.h +++ b/src/entities/eyeDroids/grenadeDroid.h @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" +extern Unit *createUnit(void); extern void initEyeDroid(Unit *u); extern Sprite *getSprite(char *name);