teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-07 16:31:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replaced sprite[] in some smaller functions

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-19 20:03:11 +02:00
parent df88b23f63
commit 2cece35902
5 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/games/exhumed/src/enginesubs.cpp
View file

@ -61,15 +61,14 @@ void precache()
for (int k = 1; k <= picanm[j].num; k++) markTileForPrecache(j + k, wall[i].pal); for (int k = 1; k <= picanm[j].num; k++) markTileForPrecache(j + k, wall[i].pal);
} }
for (i = 0; i < kMaxSprites; i++) ExhumedSpriteIterator it;
while (auto ac = it.Next())
{ {
if (sprite[i].statnum < kMaxStatus) auto sp = &ac->s();
{ int j = sp->picnum;
int j = sprite[i].picnum; markTileForPrecache(j, sp->pal);
markTileForPrecache(j, sprite[i].pal);
if (picanm[j].sf & PICANM_ANIMTYPE_MASK) if (picanm[j].sf & PICANM_ANIMTYPE_MASK)
for (int k = 1; k <= picanm[j].num; k++) markTileForPrecache(j + k, sprite[i].pal); for (int k = 1; k <= picanm[j].num; k++) markTileForPrecache(j + k, sp->pal);
}
} }
precacheMarkedTiles(); precacheMarkedTiles();
} }

12
source/games/exhumed/src/exhumed.cpp
View file

@ -189,13 +189,12 @@ void DoRedAlert(int nVal)
nRedTicks = 30; nRedTicks = 30;
} }
int i; ExhumedStatIterator it(405);
StatIterator it(405); while (auto ac = it.Next())
while ((i = it.NextIndex()) >= 0)
{ {
if (nVal) if (nVal)
{ {
auto spri = &sprite[i]; auto spri = &ac->s();
PlayFXAtXYZ(StaticSound[kSoundAlarm], spri->x, spri->y, spri->z, spri->sectnum); PlayFXAtXYZ(StaticSound[kSoundAlarm], spri->x, spri->y, spri->z, spri->sectnum);
AddFlash(spri->sectnum, spri->x, spri->y, spri->z, 192); AddFlash(spri->sectnum, spri->x, spri->y, spri->z, 192);
} }
@ -254,9 +253,10 @@ void GameMove(void)
{ {
FixPalette(); FixPalette();
for (int i = 0; i < MAXSPRITES; i++) ExhumedSpriteIterator it;
while (auto ac = it.Next())
{ {
sprite[i].backuploc(); ac->s().backuploc();
} }
if (currentLevel->gameflags & LEVEL_EX_COUNTDOWN) if (currentLevel->gameflags & LEVEL_EX_COUNTDOWN)

9
source/games/exhumed/src/init.cpp
View file

@ -805,9 +805,10 @@ void ExamineSprites()
nNetStartSprites = 0; nNetStartSprites = 0;
nCurStartSprite = 0; nCurStartSprite = 0;
for (int nSprite = 0; nSprite < kMaxSprites; nSprite++) ExhumedLinearSpriteIterator it;
while (auto ac = it.Next())
{ {
auto pSprite = &sprite[nSprite]; auto pSprite = &ac->s();
int nStatus = pSprite->statnum; int nStatus = pSprite->statnum;
if (!nStatus) if (!nStatus)
@ -820,11 +821,11 @@ void ExamineSprites()
pSprite->lotag = 0; pSprite->lotag = 0;
pSprite->hitag = 0; pSprite->hitag = 0;
ProcessSpriteTag(nSprite, lotag, hitag); ProcessSpriteTag(ac->GetSpriteIndex(), lotag, hitag);
} }
else else
{ {
changespritestat(nSprite, 0); ChangeActorStat(ac, 0);
} }
} }
} }

8
source/games/exhumed/src/map.cpp
View file

@ -49,8 +49,8 @@ void DrawMap(double const smoothratio)
{ {
if (!nFreeze && automapMode != am_off) if (!nFreeze && automapMode != am_off)
{ {
int nPlayerSprite = PlayerList[nLocalPlayer].nSprite; auto pPlayerActor = PlayerList[nLocalPlayer].Actor();
auto psp = &sprite[nPlayerSprite]; auto psp = &pPlayerActor->s();
int x = psp->interpolatedx(smoothratio); int x = psp->interpolatedx(smoothratio);
int y = psp->interpolatedy(smoothratio); int y = psp->interpolatedy(smoothratio);
@ -79,8 +79,8 @@ bool GameInterface::DrawAutomapPlayer(int x, int y, int z, int a, double const s
for (int i = connecthead; i >= 0; i = connectpoint2[i]) for (int i = connecthead; i >= 0; i = connectpoint2[i])
{ {
int nPSprite = PlayerList[i].nSprite; auto pPlayerActor = PlayerList[i].Actor();
spritetype* pSprite = &sprite[nPSprite]; spritetype* pSprite = &pPlayerActor->s();
int x1 = pSprite->x - x; int x1 = pSprite->x - x;
int y1 = pSprite->y - y; int y1 = pSprite->y - y;
int pa = (pSprite->ang - a) & 2047; int pa = (pSprite->ang - a) & 2047;

2
source/games/exhumed/src/osdcmds.cpp
View file

@ -37,7 +37,7 @@ BEGIN_PS_NS
void GameInterface::WarpToCoords(int x, int y, int z, int ang, int horz) void GameInterface::WarpToCoords(int x, int y, int z, int ang, int horz)
{ {
Player *nPlayer = &PlayerList[nLocalPlayer]; Player *nPlayer = &PlayerList[nLocalPlayer];
spritetype *pSprite = &sprite[nPlayer->nSprite]; spritetype *pSprite = &nPlayer->Actor()->s();
pSprite->ox = pSprite->x = x; pSprite->ox = pSprite->x = x;
pSprite->oy = pSprite->y = y; pSprite->oy = pSprite->y = y;