zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 12:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- reinstate code from e2db4a8 that got removed by a badly resolved merge conflict in ae4ef64 .

Browse source
This commit is contained in:
Christoph Oelckers 2023-04-10 16:48:08 +02:00
parent 2f61a44329
commit ee61daed97
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/games/duke/src/spawn.cpp
View file

@ -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)