teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 21:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- viewBackupSpriteLoc calls

Browse source
This commit is contained in:
Christoph Oelckers 2021-09-06 22:51:10 +02:00
parent 98a3564ee6
commit bac40ddb05
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/games/blood/src/nnexts.cpp
View file

@ -1374,10 +1374,8 @@ void nnExtProcessSuperSprites()
continue;
}
int nDebris = pDebris->index;
XSECTOR* pXSector = (sector[pDebris->sectnum].extra >= 0) ? &xsector[sector[pDebris->sectnum].extra] : nullptr;
viewBackupSpriteLoc(nDebris, pDebris);
viewBackupSpriteLoc(debrisactor);
bool uwater = false;
int mass = debrisactor->spriteMass.mass;
@ -1416,7 +1414,8 @@ void nnExtProcessSuperSprites()
{
pPlayer = &gPlayer[a];
auto pact = pPlayer->actor;
if (pact->hit.hit.type == kHitSprite && pact->hit.hit.index == nDebris)
if (pact->hit.hit.type == kHitSprite && pact->hit.hit.actor == debrisactor)
{
int nSpeed = approxDist(pact->xvel, pact->yvel);
nSpeed = ClipLow(nSpeed - MulScale(nSpeed, mass, 6), 0x9000 - (mass << 3));
@ -3166,7 +3165,7 @@ void useTeleportTarget(DBloodActor* sourceactor, DBloodActor* actor)
if (pXSource->data3 == 1)
actor->xvel = actor->yvel = actor->zvel = 0;
viewBackupSpriteLoc(pSprite->index, pSprite);
viewBackupSpriteLoc(actor);
if (pXSource->data4 > 0)
sfxPlay3DSound(pSource, pXSource->data4, -1, 0);

24
source/games/blood/src/triggers.cpp
View file

@ -896,7 +896,7 @@ void TranslateSector(int nSector, int a2, int a3, int a4, int a5, int a6, int a7
{
if (vbp)
RotatePoint((int*)&x, (int*)&y, vbp, a4, a5);
viewBackupSpriteLoc(pSprite->index, pSprite);
viewBackupSpriteLoc(actor);
pSprite->ang = (pSprite->ang+v14)&2047;
pSprite->x = x+vc-a4;
pSprite->y = y+v8-a5;
@ -905,7 +905,7 @@ void TranslateSector(int nSector, int a2, int a3, int a4, int a5, int a6, int a7
{
if (vbp)
RotatePoint((int*)& x, (int*)& y, -vbp, a4, a4);
viewBackupSpriteLoc(pSprite->index, pSprite);
viewBackupSpriteLoc(actor);
pSprite->ang = (pSprite->ang-v14)&2047;
pSprite->x = x-(vc-a4);
pSprite->y = y-(v8-a5);
@ -919,7 +919,7 @@ void TranslateSector(int nSector, int a2, int a3, int a4, int a5, int a6, int a7
{
if (v14)
RotatePoint((int*)&pSprite->x, (int*)&pSprite->y, v14, v20, v24);
viewBackupSpriteLoc(pSprite->index, pSprite);
viewBackupSpriteLoc(actor);
pSprite->ang = (pSprite->ang+v14)&2047;
pSprite->x += v28;
pSprite->y += v2c;
@ -949,14 +949,14 @@ void ZTranslateSector(int nSector, XSECTOR *pXSector, int a3, int a4)
GetSpriteExtents(pSprite, &top, &bottom);
if (pSprite->cstat&8192)
{
viewBackupSpriteLoc(pSprite->index, pSprite);
viewBackupSpriteLoc(actor);
pSprite->z += pSector->floorz-oldZ;
}
else if (pSprite->flags&2)
pSprite->flags |= 4;
else if (oldZ <= bottom && !(pSprite->cstat&48))
{
viewBackupSpriteLoc(pSprite->index, pSprite);
viewBackupSpriteLoc(actor);
pSprite->z += pSector->floorz-oldZ;
}
}
@ -976,7 +976,7 @@ void ZTranslateSector(int nSector, XSECTOR *pXSector, int a3, int a4)
continue;
if (pSprite->cstat&16384)
{
viewBackupSpriteLoc(pSprite->index, pSprite);
viewBackupSpriteLoc(actor);
pSprite->z += pSector->ceilingz-oldZ;
}
}
@ -1093,7 +1093,7 @@ int VSpriteBusy(unsigned int nSector, unsigned int a2)
spritetype *pSprite = &actor->s();
if (pSprite->cstat&8192)
{
viewBackupSpriteLoc(pSprite->index, pSprite);
viewBackupSpriteLoc(actor);
pSprite->z = actor->basePoint.z+MulScale(dz1, GetWaveValue(a2, nWave), 16);
}
}
@ -1107,7 +1107,7 @@ int VSpriteBusy(unsigned int nSector, unsigned int a2)
spritetype* pSprite = &actor->s();
if (pSprite->cstat & 16384)
{
viewBackupSpriteLoc(pSprite->index, pSprite);
viewBackupSpriteLoc(actor);
pSprite->z = actor->basePoint.z + MulScale(dz2, GetWaveValue(a2, nWave), 16);
}
}
@ -1460,7 +1460,7 @@ void OperateTeleport(unsigned int nSector, XSECTOR *pXSector)
actor->xvel = actor->yvel = actor->zvel = 0;
int nSprite = actor->s().index;
gInterpolateSprite.Clear(nSprite);
viewBackupSpriteLoc(nSprite, pSprite);
viewBackupSpriteLoc(actor);
if (pPlayer)
{
playerResetInertia(pPlayer);
@ -1875,7 +1875,7 @@ void ProcessMotion(void)
auto pSprite = &actor->s();
if (pSprite->cstat&24576)
{
viewBackupSpriteLoc(pSprite->index, pSprite);
viewBackupSpriteLoc(actor);
pSprite->z += vdi;
}
}
@ -1897,7 +1897,7 @@ void ProcessMotion(void)
GetSpriteExtents(pSprite, &top, &bottom);
if (bottom >= floorZ && (pSprite->cstat&48) == 0)
{
viewBackupSpriteLoc(pSprite->index, pSprite);
viewBackupSpriteLoc(actor);
pSprite->z += vdi;
}
}
@ -1917,7 +1917,7 @@ void ProcessMotion(void)
GetSpriteExtents(pSprite, &top, &bottom);
if (top <= ceilZ && (pSprite->cstat&48) == 0)
{
viewBackupSpriteLoc(pSprite->index, pSprite);
viewBackupSpriteLoc(actor);
pSprite->z += vdi;
}
}