zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-01 21:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

- mostly coolie related scaling factors.

Browse source
This commit is contained in:
Christoph Oelckers 2022-10-07 19:46:48 +02:00
parent abf5c9feee
commit 8ede08ce69
4 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/games/sw/src/coolg.cpp
View file

@ -513,8 +513,7 @@ void CoolgCommon(DSWActor* actor)
actor->user.pos.Z = actor->spr.pos.Z;
actor->spr.xrepeat = 42;
actor->spr.yrepeat = 42;
actor->spr.SetScale(0.65625, 0.65625);
actor->spr.extra |= (SPRX_PLAYER_OR_ENEMY);
}
@ -793,7 +792,7 @@ int DoCoolgDeath(DSWActor* actor)
{
actor->spr.cstat &= ~(CSTAT_SPRITE_TRANSLUCENT);
actor->spr.cstat &= ~(CSTAT_SPRITE_INVISIBLE);
actor->spr.xrepeat = 42;
actor->spr.SetScaleX(0.65625);
actor->spr.shade = -10;
if (actor->user.Flags & (SPR_FALLING))
@ -871,9 +870,9 @@ int DoCoolgMove(DSWActor* actor)
if (actor->user.FlagOwner-1 == 0)
{
actor->spr.xrepeat--;
actor->spr.AddScaleX(-REPEAT_SCALE);
actor->spr.shade++;
if (actor->spr.ScaleX() < 0.0625) actor->spr.xrepeat = 4;
if (actor->spr.ScaleX() < 0.0625) actor->spr.SetScaleX(0.0625);
if (actor->spr.shade > 126)
{
actor->spr.shade = 127;
@ -883,14 +882,14 @@ int DoCoolgMove(DSWActor* actor)
else if (actor->user.FlagOwner-1 == 2)
{
actor->spr.hitag = 0;
actor->spr.xrepeat++;
actor->spr.AddScaleX(REPEAT_SCALE);
actor->spr.shade--;
if (actor->spr.ScaleX() > 0.65625) actor->spr.xrepeat = 42;
if (actor->spr.ScaleX() > 0.65625) actor->spr.SetScaleX(0.65625);
if (actor->spr.shade < -10) actor->spr.shade = -10;
}
else if (actor->user.FlagOwner == 0)
{
actor->spr.xrepeat = 42;
actor->spr.SetScaleX(0.65625);
actor->spr.shade = -10;
actor->spr.hitag = 0;
}

3
source/games/sw/src/coolie.cpp
View file

@ -504,8 +504,7 @@ int SetupCoolie(DSWActor* actor)
EnemyDefaults(actor, &CoolieActionSet, &CooliePersonality);
actor->spr.xrepeat = 42;
actor->spr.yrepeat = 42;
actor->spr.SetScale(0.65625, 0.65625);
actor->user.Flags |= (SPR_XFLIP_TOGGLE);

3
source/games/sw/src/eel.cpp
View file

@ -372,8 +372,7 @@ void EelCommon(DSWActor* actor)
actor->user.pos.Z = actor->spr.pos.Z;
actor->spr.xrepeat = 35;
actor->spr.yrepeat = 27;
actor->spr.SetScale(0.546875, 0.421875);
actor->user.Radius = 400;
}

2
source/games/sw/src/game.h
View file

@ -2020,7 +2020,7 @@ inline double ActorSizeToTop(DSWActor* a)
inline void SetActorSizeX(DSWActor* sp)
{
sp->clipdist = MulScale(tileWidth(sp->spr.picnum), sp->spr.xrepeat, 6) * 0.25; // ensure proper truncation for this.
sp->clipdist = tileWidth(sp->spr.picnum) * sp->spr.ScaleX() * 0.25;
}
inline bool Facing(DSWActor* actor1, DSWActor* actor2)