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 FrameBase[] array and make static.

Browse source
This commit is contained in:
Mitchell Richters 2023-04-06 19:01:25 +10:00
parent fbddddcccc
commit 3e38d01e4b
3 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@ static int16_t SeqFlag[kMaxSequences]; // not used at all.
int16_t FrameSound[kMaxSEQFrames];
int16_t FrameSize[kMaxSEQFrames];
int16_t FrameBase[kMaxSEQFrames];
static int16_t FrameBase[kMaxSEQFrames];
int16_t FrameFlag[kMaxSEQFrames];
int16_t ChunkYpos[kMaxSEQChunks];
@ -190,6 +190,17 @@ int getSeqFrameCount(const int nSeq)
//
//---------------------------------------------------------------------------
int getSeqFrameChunk(const int nFrame)
{
return FrameBase[nFrame];
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int seq_ReadSequence(const char *seqName)
{
const int16_t StartFrameCount = frames;
@ -340,12 +351,7 @@ int seq_ReadSequence(const char *seqName)
int seq_GetFirstSeqPicnum(int nSeq)
{
int i = getSeqFromId(nSeq);
i = getSeqFrame(i);
i = FrameBase[i];
i = ChunkPict[i];
return i;
return ChunkPict[getSeqFrameChunk(getSeqFrame(getSeqFromId(nSeq)))];;
}
//---------------------------------------------------------------------------
@ -432,7 +438,7 @@ void seq_DrawPilotLightSeq(double xOffset, double yOffset)
if (!(pSect->Flag & kSectUnderwater))
{
int16_t nFrame = nPilotLightBase + nPilotLightFrame;
int16_t nFrameBase = FrameBase[nFrame];
int16_t nFrameBase = getSeqFrameChunk(nFrame);
int16_t nFrameSize = FrameSize[nFrame];
while (1)
@ -460,7 +466,7 @@ void seq_DrawPilotLightSeq(double xOffset, double yOffset)
int seq_DrawGunSequence(int nSeqOffset, int16_t dx, double xOffs, double yOffs, int nShade, int nPal, DAngle angle, bool align)
{
int nFrame = getSeqFrame(nSeqOffset, dx);
int nFrameBase = FrameBase[nFrame];
int nFrameBase = getSeqFrameChunk(nFrame);
int nFrameSize = FrameSize[nFrame];
int frameFlag = FrameFlag[nFrame];
@ -535,8 +541,7 @@ void seq_MoveSequence(DExhumedActor* actor, int16_t nSeq, int16_t nFrame)
int seq_GetSeqPicnum2(int16_t nSeq, int16_t nFrame)
{
int16_t nBase = FrameBase[getSeqFrame(nSeq, nFrame)];
return ChunkPict[nBase];
return ChunkPict[getSeqFrameChunk(getSeqFrame(nSeq, nFrame))];
}
//---------------------------------------------------------------------------
@ -547,9 +552,7 @@ int seq_GetSeqPicnum2(int16_t nSeq, int16_t nFrame)
int seq_GetSeqPicnum(int16_t nSeq, int16_t edx, int16_t ebx)
{
int16_t c = FrameBase[getSeqFrame(getSeqFromId(nSeq, edx))];
return ChunkPict[c];
return ChunkPict[getSeqFrameChunk(getSeqFrame(getSeqFromId(nSeq, edx)))];
}
//---------------------------------------------------------------------------
@ -567,7 +570,7 @@ int seq_PlotArrowSequence(int nSprite, int16_t nSeq, int nVal)
int16_t nFrame = getSeqFrame(nSeq + nSeqOffset, nVal);
int16_t nFrameBase = FrameBase[nFrame];
int16_t nFrameBase = getSeqFrameChunk(nFrame);
int16_t nFrameSize = FrameSize[nFrame];
uint8_t nShade = pTSprite->shade;
@ -631,7 +634,7 @@ int seq_PlotSequence(int nSprite, int16_t edx, int16_t nFrame, int16_t ecx)
int eax = getSeqFrame(edx, nFrame);
int edi = getSeqFrame(edx + val, nFrame);
int16_t nBase = FrameBase[edi];
int16_t nBase = getSeqFrameChunk(edi);
int16_t nSize = FrameSize[edi];
int8_t shade = pTSprite->shade;

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

@ -123,7 +123,6 @@ extern int16_t ChunkXpos[];
extern int16_t ChunkPict[];
extern int16_t ChunkFlag[];
extern int16_t FrameSize[];
extern int16_t FrameBase[];
void seq_LoadSequences();
@ -143,6 +142,7 @@ void seq_DrawPilotLightSeq(double xOffset, double yOffset);
int getSeqFromId(const int nSeqFileId, const int nSeq = 0);
int getSeqFrame(const int nSeq, const int nFrame = 0);
int getSeqFrameCount(const int nSeq);
int getSeqFrameChunk(const int nFrame);
END_PS_NS

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

@ -98,7 +98,7 @@ DEFINE_ACTION_FUNCTION(_Exhumed, GetStatusSequence)
PARAM_INT(frameindex);
frameindex += getSeqFrame(nSequence + nStatusSeqOffset);
if (numret > 0) ret[0].SetInt(FrameBase[frameindex]);
if (numret > 0) ret[0].SetInt(getSeqFrameChunk(frameindex));
if (numret > 1) ret[1].SetInt(FrameSize[frameindex]);
return min(numret, 2);
}