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

- deleted PLAYER::pSprite.

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-23 10:49:15 +01:00
parent 648537a96b
commit 87894a5640
4 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/blood/src/player.cpp
View file

@ -660,7 +660,6 @@ void playerStart(int nPlayer, int bNewLevel)
auto actor = actSpawnSprite(pStartZone->sector, pStartZone->x, pStartZone->y, pStartZone->z, 6, 1); auto actor = actSpawnSprite(pStartZone->sector, pStartZone->x, pStartZone->y, pStartZone->z, 6, 1);
assert(actor->hasX()); assert(actor->hasX());
XSPRITE *pXSprite = &actor->x(); XSPRITE *pXSprite = &actor->x();
pPlayer->pSprite = &actor->spr;
pPlayer->pXSprite = pXSprite; pPlayer->pXSprite = pXSprite;
pPlayer->actor = actor; pPlayer->actor = actor;
DUDEINFO *pDudeInfo = &dudeInfo[kDudePlayer1 + nPlayer - kDudeBase]; DUDEINFO *pDudeInfo = &dudeInfo[kDudePlayer1 + nPlayer - kDudeBase];
@ -2360,9 +2359,8 @@ void SerializePlayers(FSerializer& arc)
{ {
for (int i = 0; i < gNetPlayers; i++) for (int i = 0; i < gNetPlayers; i++)
{ {
gPlayer[i].pSprite = &gPlayer[i].actor->s();
gPlayer[i].pXSprite = &gPlayer[i].actor->x(); gPlayer[i].pXSprite = &gPlayer[i].actor->x();
gPlayer[i].pDudeInfo = &dudeInfo[gPlayer[i].pSprite->type - kDudeBase]; gPlayer[i].pDudeInfo = &dudeInfo[gPlayer[i].actor->spr.type - kDudeBase];
#ifdef NOONE_EXTENSIONS #ifdef NOONE_EXTENSIONS
// load qav scene // load qav scene

1
source/games/blood/src/player.h
View file

@ -81,7 +81,6 @@ extern POSTURE gPostureDefaults[kModeMax][kPostureMax];
struct PLAYER struct PLAYER
{ {
TObjPtr<DBloodActor*> actor; TObjPtr<DBloodActor*> actor;
spritetype* pSprite;
XSPRITE* pXSprite; XSPRITE* pXSprite;
DUDEINFO* pDudeInfo; DUDEINFO* pDudeInfo;
InputPacket input; InputPacket input;

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

@ -471,10 +471,10 @@ void OperateSprite(DBloodActor* actor, EVENT event)
pXSprite->isTriggered = 1; pXSprite->isTriggered = 1;
SetSpriteState(actor, 1); SetSpriteState(actor, 1);
for (int p = connecthead; p >= 0; p = connectpoint2[p]) { for (int p = connecthead; p >= 0; p = connectpoint2[p]) {
spritetype *pPlayerSprite = gPlayer[p].pSprite; auto vec = actor->spr.pos - gPlayer[p].actor->spr.pos;
int dx = (actor->spr.pos.X - pPlayerSprite->pos.X)>>4; int dx = (vec.X)>>4;
int dy = (actor->spr.pos.Y - pPlayerSprite->pos.Y)>>4; int dy = (vec.Y)>>4;
int dz = (actor->spr.pos.Z - pPlayerSprite->pos.Z)>>8; int dz = (vec.Z)>>8;
int nDist = dx*dx+dy*dy+dz*dz+0x40000; int nDist = dx*dx+dy*dy+dz*dz+0x40000;
gPlayer[p].quakeEffect = DivScale(pXSprite->data1, nDist, 16); gPlayer[p].quakeEffect = DivScale(pXSprite->data1, nDist, 16);
} }

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

@ -475,7 +475,7 @@ void SetupView(int &cX, int& cY, int& cZ, binangle& cA, fixedhoriz& cH, sectorty
} }
else else
{ {
calcChaseCamPos((int*)&cX, (int*)&cY, (int*)&cZ, gView->pSprite, &pSector, cA, cH, gInterpolate); calcChaseCamPos((int*)&cX, (int*)&cY, (int*)&cZ, &gView->actor->spr, &pSector, cA, cH, gInterpolate);
} }
CheckLink((int*)&cX, (int*)&cY, (int*)&cZ, &pSector); CheckLink((int*)&cX, (int*)&cY, (int*)&cZ, &pSector);
} }
@ -526,7 +526,7 @@ void renderCrystalBall()
vd4 += QRandom2(nValue >> 4); vd4 += QRandom2(nValue >> 4);
vd0 += QRandom2(nValue); vd0 += QRandom2(nValue);
} }
CalcOtherPosition(pOther->pSprite, &vd8, &vd4, &vd0, &vcc, v50, 0, (int)gInterpolate); CalcOtherPosition(pOther->actor, &vd8, &vd4, &vd0, &vcc, v50, 0, (int)gInterpolate);
CheckLink(&vd8, &vd4, &vd0, &vcc); CheckLink(&vd8, &vd4, &vd0, &vcc);
uint8_t v14 = 0; uint8_t v14 = 0;
if (IsUnderwaterSector(vcc)) if (IsUnderwaterSector(vcc))
@ -711,7 +711,7 @@ void viewDrawScreen(bool sceneonly)
UpdateDacs(0, true); // keep the view palette active only for the actual 3D view and its overlays. UpdateDacs(0, true); // keep the view palette active only for the actual 3D view and its overlays.
if (automapMode != am_off) if (automapMode != am_off)
{ {
DrawMap (gView->pSprite); DrawMap (&gView->actor->spr);
} }
UpdateStatusBar(); UpdateStatusBar();
int zn = ((gView->zWeapon-gView->zView-(12<<8))>>7)+220; int zn = ((gView->zWeapon-gView->zView-(12<<8))>>7)+220;