teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-04 15:10:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- int_Actor* cleanup.

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-31 23:10:50 +02:00
parent 35d74c7f9f
commit 651bf324e3
2 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2162,14 +2162,9 @@ inline double ActorZOfBottom(DSWActor* actor)
return GetSpriteZOfBottom(&actor->spr) * zinttoworld;
}
inline int int_ActorZOfMiddle(DSWActor* actor)
{
return (int_ActorZOfTop(actor) + int_ActorZOfBottom(actor)) >> 1;
}
inline double ActorZOfMiddle(DSWActor* actor)
{
return (int_ActorZOfTop(actor) + int_ActorZOfBottom(actor)) * zinttoworld * 0.5;
return (ActorZOfTop(actor) + ActorZOfBottom(actor)) * 0.5;
}
inline DVector3 ActorVectOfMiddle(DSWActor* actor)
@ -2187,11 +2182,6 @@ inline double ActorSizeZ(DSWActor* actor)
return (tileHeight(actor->spr.picnum) * actor->spr.yrepeat) / 64.;
}
inline int int_ActorUpperZ(DSWActor* actor)
{
return (int_ActorZOfTop(actor) + (int_ActorSizeZ(actor) >> 2));
}
inline double ActorUpperZ(DSWActor* actor)
{
return (ActorZOfTop(actor) + (ActorSizeZ(actor) * 0.25));
@ -2202,14 +2192,9 @@ inline DVector3 ActorUpperVect(DSWActor* actor)
return DVector3(actor->spr.pos.XY(), ActorUpperZ(actor));
}
inline int int_ActorLowerZ(DSWActor* actor)
{
return (int_ActorZOfBottom(actor) - (int_ActorSizeZ(actor) >> 2));
}
inline double ActorLowerZ(DSWActor* actor)
{
return (int_ActorZOfBottom(actor) - (int_ActorSizeZ(actor) * 0.25)) * zinttoworld;
return (ActorZOfBottom(actor) - (ActorSizeZ(actor) * 0.25));
}
inline DVector3 ActorLowerVect(DSWActor* actor)
@ -2217,16 +2202,10 @@ inline DVector3 ActorLowerVect(DSWActor* actor)
return DVector3(actor->spr.pos.XY(), ActorLowerZ(actor));
}
// Z size of top (TOS) and bottom (BOS) part of sprite
inline int ActorSizeToTop(DSWActor* a)
inline double ActorSizeToTop(DSWActor* a)
{
return ((int_ActorSizeZ(a)) + (tileTopOffset(a->spr.picnum) << 8)) >> 1;
}
inline int ActorSizeToBottom(DSWActor* a)
{
return ((int_ActorSizeZ(a)) - (tileTopOffset(a->spr.picnum) << 8)) >> 1;
return (ActorSizeZ(a) + tileTopOffset(a->spr.picnum)) * 0.5;
}
inline int ActorSizeX(DSWActor* sp)

4
source/games/sw/src/skull.cpp
View file

@ -238,7 +238,7 @@ int SetupSkull(DSWActor* actor)
actor->user.loz = actor->spr.pos.Z;
// leave 8 pixels above the ground
actor->add_int_z(ActorSizeToTop(actor) - Z(3));
actor->spr.pos.Z += ActorSizeToTop(actor) - 3;
}
else
{
@ -619,7 +619,7 @@ int SetupBetty(DSWActor* actor)
actor->user.loz = actor->spr.pos.Z;
// leave 8 pixels above the ground
actor->add_int_z(ActorSizeToTop(actor) - Z(3));
actor->spr.pos.Z += ActorSizeToTop(actor) - 3;
}
else
{