zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 18:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- replaced one sprite inline with its actor variant.

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-26 00:40:25 +01:00
parent 4e7724ece2
commit 6df854d612
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/sw/src/actor.cpp
View file

@ -331,7 +331,7 @@ int DoActorSectorDamage(DSWActor* actor)
}
}
}
else if (GetSpriteZOfBottom(&actor->spr) >= sectp->floorz)
else if (ActorZOfBottom(actor) >= sectp->floorz)
{
if ((actor->user.DamageTics -= synctics) < 0)
{

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

@ -1709,7 +1709,7 @@ void SetOwner(int a, int b); // we still need this...
void ClearOwner(DSWActor* ownr);
DSWActor* GetOwner(DSWActor* child);
void SetAttach(DSWActor*, DSWActor*);
void analyzesprites(spritetype* tsprite, int& spritesortcnt, int viewx, int viewy, int viewz, int camang);
void analyzesprites(tspritetype* tsprite, int& spritesortcnt, int viewx, int viewy, int viewz, int camang);
void CollectPortals();
int SpawnBlood(DSWActor* actor, DSWActor* weapActor, short hit_ang, int hit_x, int hit_y, int hit_z);
@ -2100,12 +2100,12 @@ inline int ActorSizeZ(DSWActor* actor)
inline int ActorUpperZ(DSWActor* actor)
{
return (GetSpriteZOfTop(&actor->spr) + (GetSpriteSizeZ(&actor->spr) >> 2));
return (ActorZOfTop(actor) + (ActorSizeZ(actor) >> 2));
}
inline int ActorLowerZ(DSWActor* actor)
{
return (GetSpriteZOfBottom(&actor->spr) - (GetSpriteSizeZ(&actor->spr) >> 2));
return (ActorZOfBottom(actor) - (ActorSizeZ(actor) >> 2));
}
// Z size of top (TOS) and bottom (BOS) part of sprite