From ee61daed97b78953ed77d6fd85224b5602f28023 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 10 Apr 2023 16:48:08 +0200 Subject: [PATCH] - reinstate code from e2db4a8 that got removed by a badly resolved merge conflict in ae4ef64 . --- source/games/duke/src/spawn.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/source/games/duke/src/spawn.cpp b/source/games/duke/src/spawn.cpp index 34f8a3a49..3b2439560 100644 --- a/source/games/duke/src/spawn.cpp +++ b/source/games/duke/src/spawn.cpp @@ -300,12 +300,18 @@ bool commonEnemySetup(DDukeActor* self, DDukeActor* owner) { if (!self->mapSpawned) self->spr.lotag = 0; - // Init the size. This is different for internal and user enemies. - self->clipdist = 20; - if (self->flags1 & SFLAG_INTERNAL_BADGUY) + if (gs.actorinfo[self->spr.picnum].scriptaddress) // default scale only applies to actors with a CON part. Note: needs fixing later! { - self->spr.scale = DVector2(0.625, 0.625); - + // Init the size. This is different for internal and user enemies. + self->clipdist = 20; + if (self->flags1 & SFLAG_INTERNAL_BADGUY) + { + self->spr.scale = DVector2(0.625, 0.625); + } + else if (self->spr.scale.X == 0 || self->spr.scale.Y == 0) + { + self->spr.scale = DVector2(REPEAT_SCALE, REPEAT_SCALE); + } } if ((self->spr.lotag > ud.player_skill) || ud.monsters_off == 1)