zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Wrap all access to ChunkXpos[] and ChunkYpos[] arrays and make static.

Browse source
This commit is contained in:
Mitchell Richters 2023-04-06 19:17:50 +10:00
parent 924ac25df1
commit 78489dbc78
3 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
source/games/exhumed/src/sequence.cpp
View file

@ -60,8 +60,8 @@ static int16_t FrameSize[kMaxSEQFrames];
static int16_t FrameBase[kMaxSEQFrames];
static int16_t FrameFlag[kMaxSEQFrames];
int16_t ChunkYpos[kMaxSEQChunks];
int16_t ChunkXpos[kMaxSEQChunks];
static int16_t ChunkYpos[kMaxSEQChunks];
static int16_t ChunkXpos[kMaxSEQChunks];
int16_t ChunkPict[kMaxSEQChunks];
int16_t ChunkFlag[kMaxSEQChunks];
@ -223,6 +223,28 @@ int getSeqFrameChunkCount(const int nFrame)
//
//---------------------------------------------------------------------------
int getSeqFrameChunkPosX(const int nChunk)
{
return ChunkXpos[nChunk];
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int getSeqFrameChunkPosY(const int nChunk)
{
return ChunkYpos[nChunk];
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int seq_ReadSequence(const char *seqName)
{
const int16_t StartFrameCount = frames;
@ -459,8 +481,8 @@ void seq_DrawPilotLightSeq(double xOffset, double yOffset)
return;
int16_t nTile = ChunkPict[nFrameBase];
double x = ChunkXpos[nFrameBase] + (160 + xOffset);
double y = ChunkYpos[nFrameBase] + (100 + yOffset);
double x = getSeqFrameChunkPosX(nFrameBase) + (160 + xOffset);
double y = getSeqFrameChunkPosY(nFrameBase) + (100 + yOffset);
hud_drawsprite(x, y, 65536, PlayerList[nLocalPlayer].pActor->spr.Angles.Yaw.Normalized180().Degrees() * 2., nTile, 0, 0, 1);
nFrameBase++;
@ -487,8 +509,8 @@ int seq_DrawGunSequence(int nSeqOffset, int16_t dx, double xOffs, double yOffs,
if (nFrameSize < 0)
break;
int x = ChunkXpos[nFrameBase] + 160;
int y = ChunkYpos[nFrameBase] + 100;
int x = getSeqFrameChunkPosX(nFrameBase) + 160;
int y = getSeqFrameChunkPosY(nFrameBase) + 100;
int stat = 0;
if (ChunkFlag[nFrameBase] & 1)
@ -606,15 +628,15 @@ int seq_PlotArrowSequence(int nSprite, int16_t nSeq, int nVal)
if (ChunkFlag[nFrameBase] & 1)
{
pTSprite->xoffset = (int8_t)ChunkXpos[nFrameBase];
pTSprite->xoffset = (int8_t)getSeqFrameChunkPosX(nFrameBase);
pTSprite->cstat |= CSTAT_SPRITE_XFLIP;
}
else
{
pTSprite->xoffset = (int8_t)-ChunkXpos[nFrameBase];
pTSprite->xoffset = (int8_t)-getSeqFrameChunkPosX(nFrameBase);
}
pTSprite->yoffset = -ChunkYpos[nFrameBase];
pTSprite->yoffset = -getSeqFrameChunkPosY(nFrameBase);
pTSprite->picnum = ChunkPict[nFrameBase];
return ChunkPict[nFrameBase];
@ -696,15 +718,15 @@ int seq_PlotSequence(int nSprite, int16_t edx, int16_t nFrame, int16_t ecx)
if (ChunkFlag[nBase] & 1)
{
tsp->xoffset = (int8_t)ChunkXpos[nBase];
tsp->xoffset = (int8_t)getSeqFrameChunkPosX(nBase);
tsp->cstat |= CSTAT_SPRITE_XFLIP; // x-flipped
}
else
{
tsp->xoffset = -ChunkXpos[nBase];
tsp->xoffset = -getSeqFrameChunkPosX(nBase);
}
tsp->yoffset = -ChunkYpos[nBase];
tsp->yoffset = -getSeqFrameChunkPosY(nBase);
tsp->picnum = ChunkPict[nBase];
nBase++;

4
source/games/exhumed/src/sequence.h
View file

@ -116,8 +116,6 @@ extern int16_t nFlameHeight;
extern int16_t nPilotLightFrame;
extern int16_t nPilotLightCount;
extern int16_t ChunkYpos[];
extern int16_t ChunkXpos[];
extern int16_t ChunkPict[];
extern int16_t ChunkFlag[];
@ -141,6 +139,8 @@ int getSeqFrameCount(const int nSeq);
int getSeqFrameChunk(const int nFrame);
int getSeqFrameFlags(const int nFrame);
int getSeqFrameChunkCount(const int nFrame);
int getSeqFrameChunkPosX(const int nChunk);
int getSeqFrameChunkPosY(const int nChunk);
END_PS_NS

4
source/games/exhumed/src/status.cpp
View file

@ -68,8 +68,8 @@ struct ChunkFrame
void GetChunkFrame(int nFrameBase)
{
x = ChunkXpos[nFrameBase];
y = ChunkYpos[nFrameBase];
x = getSeqFrameChunkPosX(nFrameBase);
y = getSeqFrameChunkPosY(nFrameBase);
auto ttex = tileGetTexture(ChunkPict[nFrameBase]);
if (ttex) tex = ttex->GetID();
else tex.SetInvalid();