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

- eliminated add_int_z and add_int_y wrappers

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-30 22:18:41 +02:00
parent 681784fdf8
commit 1d28ebec98
3 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/core/maptypes.h
View file

@ -527,14 +527,6 @@ struct tspritetype : public spritetypebase
DCoreActor* ownerActor;
int time;
void add_int_x(int x)
{
pos.X += x * inttoworld;
}
void add_int_y(int x)
{
pos.Y += x * inttoworld;
}
void add_int_z(int x)
{
pos.Z += x * zinttoworld;

6
source/games/blood/src/animatesprite.cpp
View file

@ -483,8 +483,7 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF
pNSprite->picnum = nVoxel;
if (pPlayer->curWeapon == kWeapLifeLeech) // position lifeleech behind player
{
pNSprite->add_int_x(MulScale(128, Cos(gView->actor->int_ang()), 30));
pNSprite->add_int_y(MulScale(128, Sin(gView->actor->int_ang()), 30));
pNSprite->pos.XY() += gView->actor->spr.angle.ToVector() * 8;
}
if ((pPlayer->curWeapon == kWeapLifeLeech) || (pPlayer->curWeapon == kWeapVoodooDoll)) // make lifeleech/voodoo doll always face viewer like sprite
pNSprite->set_int_ang((pNSprite->int_ang() + 512) & 2047); // offset angle 90 degrees
@ -874,8 +873,7 @@ void viewProcessSprites(tspriteArray& tsprites, int32_t cX, int32_t cY, int32_t
auto pNTSprite = viewAddEffect(tsprites, nTSprite, kViewEffectShoot);
if (pNTSprite) {
POSTURE* pPosture = &pPlayer->pPosture[pPlayer->lifeMode][pPlayer->posture];
pNTSprite->add_int_x(MulScale(pPosture->zOffset, Cos(pTSprite->int_ang()), 28));
pNTSprite->add_int_y(MulScale(pPosture->zOffset, Sin(pTSprite->int_ang()), 28));
pNTSprite->pos.XY() += pTSprite->angle.ToVector() * pPosture->zOffset * 0.25;
pNTSprite->set_int_z(pPlayer->actor->int_pos().Z - pPosture->xOffset);
}
}

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

@ -408,8 +408,8 @@ void DoMotionBlur(tspriteArray& tsprites, tspritetype const * const tsp)
*tSpr = *tsp;
tSpr->cstat |= CSTAT_SPRITE_TRANSLUCENT|CSTAT_SPRITE_TRANS_FLIP;
tSpr->add_int_x(dx);
tSpr->add_int_y(dy);
tSpr->pos.X += (dx * inttoworld);
tSpr->pos.Y += (dy * inttoworld);
dx += nx;
dy += ny;