mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Rename member variables

pull/1753/head
obligaron 5 years ago committed by Anders Jenbo
parent
0b5183f63e
commit
1de46a8495
9 changed files with 117 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      Source/engine/animationinfo.h
  2. 18
      Source/loadsave.cpp
  3. 4
      Source/msg.cpp
  4. 4
      Source/multi.cpp
  5. 156
      Source/player.cpp
  6. 2
      Source/scrollrt.cpp
  7. 20
      test/animationinfo_test.cpp
  8. 4
      test/player_test.cpp
  9. 8
      test/writehero_test.cpp

18
Source/engine/animationinfo.h
Unescape View File

@ -17,35 +17,35 @@ public:
/*
* @brief Pointer to Animation Data
*/
uint8_t *_pAnimData;
uint8_t *pData;
/*
* @brief Additional delay of each animation in the current animation
*/
int _pAnimDelay;
int DelayLen;
/*
* @brief Increases by one each game tick, counting how close we are to _pAnimDelay
* @brief Increases by one each game tick, counting how close we are to DelayLen
*/
int _pAnimCnt;
int DelayCounter;
/*
* @brief Number of frames in current animation
*/
int _pAnimLen;
int FrameLen;
/*
* @brief Current frame of animation
*/
int _pAnimFrame;
int CurrentFrame;
/*
* @brief Specifies how many animations-fractions are displayed between two gameticks. this can be > 0, if animations are skipped or < 0 if the same animation is shown in multiple times (delay specified).
*/
float _pAnimGameTickModifier;
float GameTickModifier;
/*
* @brief Number of GameTicks after the current animation sequence started
*/
int _pAnimGameTicksSinceSequenceStarted;
int GameTicksSinceSequenceStarted;
/*
* @brief Animation Frames that will be adjusted for the skipped Frames/GameTicks
*/
int _pAnimRelevantAnimationFramesForDistributing;
int RelevantFramesForDistributing;
};
} // namespace devilution

18
Source/loadsave.cpp
Unescape View File

@ -342,11 +342,11 @@ static void LoadPlayer(LoadHelper *file, int p)
pPlayer->_pdir = static_cast<direction>(file->nextLE<int32_t>());
file->skip(4); // Unused
pPlayer->_pgfxnum = file->nextLE<int32_t>();
file->skip(4); // Skip pointer _pAnimData
pPlayer->AnimInfo._pAnimDelay = file->nextLE<int32_t>();
pPlayer->AnimInfo._pAnimCnt = file->nextLE<int32_t>();
pPlayer->AnimInfo._pAnimLen = file->nextLE<int32_t>();
pPlayer->AnimInfo._pAnimFrame = file->nextLE<int32_t>();
file->skip(4); // Skip pointer pData
pPlayer->AnimInfo.DelayLen = file->nextLE<int32_t>();
pPlayer->AnimInfo.DelayCounter = file->nextLE<int32_t>();
pPlayer->AnimInfo.FrameLen = file->nextLE<int32_t>();
pPlayer->AnimInfo.CurrentFrame = file->nextLE<int32_t>();
pPlayer->_pAnimWidth = file->nextLE<int32_t>();
// Skip _pAnimWidth2
file->skip(4);
@ -1327,10 +1327,10 @@ static void SavePlayer(SaveHelper *file, int p)
file->skip(4); // Unused
file->writeLE<int32_t>(pPlayer->_pgfxnum);
file->skip(4); // Skip pointer _pAnimData
file->writeLE<int32_t>(pPlayer->AnimInfo._pAnimDelay);
file->writeLE<int32_t>(pPlayer->AnimInfo._pAnimCnt);
file->writeLE<int32_t>(pPlayer->AnimInfo._pAnimLen);
file->writeLE<int32_t>(pPlayer->AnimInfo._pAnimFrame);
file->writeLE<int32_t>(pPlayer->AnimInfo.DelayLen);
file->writeLE<int32_t>(pPlayer->AnimInfo.DelayCounter);
file->writeLE<int32_t>(pPlayer->AnimInfo.FrameLen);
file->writeLE<int32_t>(pPlayer->AnimInfo.CurrentFrame);
file->writeLE<int32_t>(pPlayer->_pAnimWidth);
// write _pAnimWidth2 for vanilla compatibility
file->writeLE<int32_t>(CalculateWidth2(pPlayer->_pAnimWidth));

4
Source/msg.cpp
Unescape View File

@ -2235,8 +2235,8 @@ static DWORD On_PLAYER_JOINLEVEL(TCmd *pCmd, int pnum)
LoadPlrGFX(pnum, PFILE_DEATH);
plr[pnum]._pmode = PM_DEATH;
NewPlrAnim(pnum, plr[pnum]._pDAnim[DIR_S], plr[pnum]._pDFrames, 1, plr[pnum]._pDWidth);
plr[pnum].AnimInfo._pAnimFrame = plr[pnum].AnimInfo._pAnimLen - 1;
plr[pnum].actionFrame = plr[pnum].AnimInfo._pAnimLen * 2;
plr[pnum].AnimInfo.CurrentFrame = plr[pnum].AnimInfo.FrameLen - 1;
plr[pnum].actionFrame = plr[pnum].AnimInfo.FrameLen * 2;
dFlags[plr[pnum].position.tile.x][plr[pnum].position.tile.y] |= BFLAG_DEAD_PLAYER;
}

4
Source/multi.cpp
Unescape View File

@ -880,8 +880,8 @@ void recv_plrinfo(int pnum, TCmdPlrInfoHdr *p, bool recv)
LoadPlrGFX(pnum, PFILE_DEATH);
plr[pnum]._pmode = PM_DEATH;
NewPlrAnim(pnum, plr[pnum]._pDAnim[DIR_S], plr[pnum]._pDFrames, 1, plr[pnum]._pDWidth);
plr[pnum].AnimInfo._pAnimFrame = plr[pnum].AnimInfo._pAnimLen - 1;
plr[pnum].actionFrame = 2 * plr[pnum].AnimInfo._pAnimLen;
plr[pnum].AnimInfo.CurrentFrame = plr[pnum].AnimInfo.FrameLen - 1;
plr[pnum].actionFrame = 2 * plr[pnum].AnimInfo.FrameLen;
dFlags[plr[pnum].position.tile.x][plr[pnum].position.tile.y] |= BFLAG_DEAD_PLAYER;
}
}

156
Source/player.cpp
Unescape View File

@ -544,15 +544,15 @@ void NewPlrAnim(int pnum, BYTE *Peq, int numFrames, int Delay, int width, Animat
app_fatal("NewPlrAnim: illegal player %d", pnum);
}
plr[pnum].AnimInfo._pAnimData = Peq;
plr[pnum].AnimInfo._pAnimLen = numFrames;
plr[pnum].AnimInfo._pAnimFrame = 1;
plr[pnum].AnimInfo._pAnimCnt = 0;
plr[pnum].AnimInfo._pAnimDelay = Delay;
plr[pnum].AnimInfo.pData = Peq;
plr[pnum].AnimInfo.FrameLen = numFrames;
plr[pnum].AnimInfo.CurrentFrame = 1;
plr[pnum].AnimInfo.DelayCounter = 0;
plr[pnum].AnimInfo.DelayLen = Delay;
plr[pnum]._pAnimWidth = width;
plr[pnum].AnimInfo._pAnimGameTicksSinceSequenceStarted = 0;
plr[pnum].AnimInfo._pAnimRelevantAnimationFramesForDistributing = 0;
plr[pnum].AnimInfo._pAnimGameTickModifier = 0.0f;
plr[pnum].AnimInfo.GameTicksSinceSequenceStarted = 0;
plr[pnum].AnimInfo.RelevantFramesForDistributing = 0;
plr[pnum].AnimInfo.GameTickModifier = 0.0f;
if (numSkippedFrames != 0 || params != AnimationDistributionParams::None) {
// Animation Frames that will be adjusted for the skipped Frames/GameTicks
@ -582,8 +582,8 @@ void NewPlrAnim(int pnum, BYTE *Peq, int numFrames, int Delay, int width, Animat
relevantAnimationGameTicksWithSkipping -= 1;
// The Animation Distribution Logic needs to account how many GameTicks passed since the Animation started.
// Because ProcessAnimation will increase this later (in same GameTick as NewPlrAnim), we correct this upfront.
// This also means Rendering should never hapen with _pAnimGameTicksSinceSequenceStarted < 0.
plr[pnum].AnimInfo._pAnimGameTicksSinceSequenceStarted = -1;
// This also means Rendering should never hapen with GameTicksSinceSequenceStarted < 0.
plr[pnum].AnimInfo.GameTicksSinceSequenceStarted = -1;
}
if (params == AnimationDistributionParams::SkipsDelayOfLastFrame) {
@ -612,8 +612,8 @@ void NewPlrAnim(int pnum, BYTE *Peq, int numFrames, int Delay, int width, Animat
// gameTickModifier specifies the Animation fraction per GameTick, so we have to remove the delay from the variable
gameTickModifier /= gameTicksPerFrame;
plr[pnum].AnimInfo._pAnimRelevantAnimationFramesForDistributing = relevantAnimationFramesForDistributing;
plr[pnum].AnimInfo._pAnimGameTickModifier = gameTickModifier;
plr[pnum].AnimInfo.RelevantFramesForDistributing = relevantAnimationFramesForDistributing;
plr[pnum].AnimInfo.GameTickModifier = gameTickModifier;
}
}
@ -1135,13 +1135,13 @@ void InitPlayer(int pnum, bool FirstTime)
if (plr[pnum]._pHitPoints >> 6 > 0) {
plr[pnum]._pmode = PM_STAND;
NewPlrAnim(pnum, plr[pnum]._pNAnim[DIR_S], plr[pnum]._pNFrames, 3, plr[pnum]._pNWidth);
plr[pnum].AnimInfo._pAnimFrame = GenerateRnd(plr[pnum]._pNFrames - 1) + 1;
plr[pnum].AnimInfo._pAnimCnt = GenerateRnd(3);
plr[pnum].AnimInfo.CurrentFrame = GenerateRnd(plr[pnum]._pNFrames - 1) + 1;
plr[pnum].AnimInfo.DelayCounter = GenerateRnd(3);
} else {
plr[pnum]._pmode = PM_DEATH;
NewPlrAnim(pnum, plr[pnum]._pDAnim[DIR_S], plr[pnum]._pDFrames, 1, plr[pnum]._pDWidth);
plr[pnum].AnimInfo._pAnimFrame = plr[pnum].AnimInfo._pAnimLen - 1;
plr[pnum].actionFrame = 2 * plr[pnum].AnimInfo._pAnimLen;
plr[pnum].AnimInfo.CurrentFrame = plr[pnum].AnimInfo.FrameLen - 1;
plr[pnum].actionFrame = 2 * plr[pnum].AnimInfo.FrameLen;
}
plr[pnum]._pdir = DIR_S;
@ -2275,21 +2275,21 @@ bool PM_DoWalk(int pnum, int variant)
//Play walking sound effect on certain animation frames
if (sgOptions.Audio.bWalkingSound) {
if (plr[pnum].AnimInfo._pAnimFrame == 3
|| (plr[pnum]._pWFrames == 8 && plr[pnum].AnimInfo._pAnimFrame == 7)
|| (plr[pnum]._pWFrames != 8 && plr[pnum].AnimInfo._pAnimFrame == 4)) {
if (plr[pnum].AnimInfo.CurrentFrame == 3
|| (plr[pnum]._pWFrames == 8 && plr[pnum].AnimInfo.CurrentFrame == 7)
|| (plr[pnum]._pWFrames != 8 && plr[pnum].AnimInfo.CurrentFrame == 4)) {
PlaySfxLoc(PS_WALK1, plr[pnum].position.tile.x, plr[pnum].position.tile.y);
}
}
//"Jog" in town which works by doubling movement speed and skipping every other animation frame
if (currlevel == 0 && sgGameInitInfo.bRunInTown) {
if (plr[pnum].AnimInfo._pAnimFrame % 2 == 0) {
plr[pnum].AnimInfo._pAnimFrame++;
if (plr[pnum].AnimInfo.CurrentFrame % 2 == 0) {
plr[pnum].AnimInfo.CurrentFrame++;
plr[pnum].actionFrame++;
}
if (plr[pnum].AnimInfo._pAnimFrame >= plr[pnum]._pWFrames) {
plr[pnum].AnimInfo._pAnimFrame = 0;
if (plr[pnum].AnimInfo.CurrentFrame >= plr[pnum]._pWFrames) {
plr[pnum].AnimInfo.CurrentFrame = 0;
}
}
@ -2799,24 +2799,24 @@ bool PM_DoAttack(int pnum)
app_fatal("PM_DoAttack: illegal player %d", pnum);
}
frame = plr[pnum].AnimInfo._pAnimFrame;
frame = plr[pnum].AnimInfo.CurrentFrame;
if (plr[pnum]._pIFlags & ISPL_QUICKATTACK && frame == 1) {
plr[pnum].AnimInfo._pAnimFrame++;
plr[pnum].AnimInfo.CurrentFrame++;
}
if (plr[pnum]._pIFlags & ISPL_FASTATTACK && (frame == 1 || frame == 3)) {
plr[pnum].AnimInfo._pAnimFrame++;
plr[pnum].AnimInfo.CurrentFrame++;
}
if (plr[pnum]._pIFlags & ISPL_FASTERATTACK && (frame == 1 || frame == 3 || frame == 5)) {
plr[pnum].AnimInfo._pAnimFrame++;
plr[pnum].AnimInfo.CurrentFrame++;
}
if (plr[pnum]._pIFlags & ISPL_FASTESTATTACK && (frame == 1 || frame == 4)) {
plr[pnum].AnimInfo._pAnimFrame += 2;
plr[pnum].AnimInfo.CurrentFrame += 2;
}
if (plr[pnum].AnimInfo._pAnimFrame == plr[pnum]._pAFNum - 1) {
if (plr[pnum].AnimInfo.CurrentFrame == plr[pnum]._pAFNum - 1) {
PlaySfxLoc(PS_SWING, plr[pnum].position.tile.x, plr[pnum].position.tile.y);
}
if (plr[pnum].AnimInfo._pAnimFrame == plr[pnum]._pAFNum) {
if (plr[pnum].AnimInfo.CurrentFrame == plr[pnum]._pAFNum) {
dx = plr[pnum].position.tile.x + offset_x[plr[pnum]._pdir];
dy = plr[pnum].position.tile.y + offset_y[plr[pnum]._pdir];
@ -2893,7 +2893,7 @@ bool PM_DoAttack(int pnum)
}
}
if (plr[pnum].AnimInfo._pAnimFrame == plr[pnum]._pAFrames) {
if (plr[pnum].AnimInfo.CurrentFrame == plr[pnum]._pAFrames) {
StartStand(pnum, plr[pnum]._pdir);
ClearPlrPVars(pnum);
return true;
@ -2910,20 +2910,20 @@ bool PM_DoRangeAttack(int pnum)
}
if (!gbIsHellfire) {
origFrame = plr[pnum].AnimInfo._pAnimFrame;
origFrame = plr[pnum].AnimInfo.CurrentFrame;
if (plr[pnum]._pIFlags & ISPL_QUICKATTACK && origFrame == 1) {
plr[pnum].AnimInfo._pAnimFrame++;
plr[pnum].AnimInfo.CurrentFrame++;
}
if (plr[pnum]._pIFlags & ISPL_FASTATTACK && (origFrame == 1 || origFrame == 3)) {
plr[pnum].AnimInfo._pAnimFrame++;
plr[pnum].AnimInfo.CurrentFrame++;
}
}
int arrows = 0;
if (plr[pnum].AnimInfo._pAnimFrame == plr[pnum]._pAFNum) {
if (plr[pnum].AnimInfo.CurrentFrame == plr[pnum]._pAFNum) {
arrows = 1;
}
if ((plr[pnum]._pIFlags & ISPL_MULT_ARROWS) != 0 && plr[pnum].AnimInfo._pAnimFrame == plr[pnum]._pAFNum + 2) {
if ((plr[pnum]._pIFlags & ISPL_MULT_ARROWS) != 0 && plr[pnum].AnimInfo.CurrentFrame == plr[pnum]._pAFNum + 2) {
arrows = 2;
}
@ -2976,7 +2976,7 @@ bool PM_DoRangeAttack(int pnum)
}
}
if (plr[pnum].AnimInfo._pAnimFrame >= plr[pnum]._pAFrames) {
if (plr[pnum].AnimInfo.CurrentFrame >= plr[pnum]._pAFrames) {
StartStand(pnum, plr[pnum]._pdir);
ClearPlrPVars(pnum);
return true;
@ -3025,11 +3025,11 @@ bool PM_DoBlock(int pnum)
app_fatal("PM_DoBlock: illegal player %d", pnum);
}
if (plr[pnum]._pIFlags & ISPL_FASTBLOCK && plr[pnum].AnimInfo._pAnimFrame != 1) {
plr[pnum].AnimInfo._pAnimFrame = plr[pnum]._pBFrames;
if (plr[pnum]._pIFlags & ISPL_FASTBLOCK && plr[pnum].AnimInfo.CurrentFrame != 1) {
plr[pnum].AnimInfo.CurrentFrame = plr[pnum]._pBFrames;
}
if (plr[pnum].AnimInfo._pAnimFrame >= plr[pnum]._pBFrames) {
if (plr[pnum].AnimInfo.CurrentFrame >= plr[pnum]._pBFrames) {
StartStand(pnum, plr[pnum]._pdir);
ClearPlrPVars(pnum);
@ -3121,7 +3121,7 @@ bool PM_DoSpell(int pnum)
ClearPlrPVars(pnum);
return true;
}
} else if (plr[pnum].AnimInfo._pAnimFrame == plr[pnum]._pSFrames) {
} else if (plr[pnum].AnimInfo.CurrentFrame == plr[pnum]._pSFrames) {
StartStand(pnum, plr[pnum]._pdir);
ClearPlrPVars(pnum);
return true;
@ -3138,18 +3138,18 @@ bool PM_DoGotHit(int pnum)
app_fatal("PM_DoGotHit: illegal player %d", pnum);
}
frame = plr[pnum].AnimInfo._pAnimFrame;
frame = plr[pnum].AnimInfo.CurrentFrame;
if (plr[pnum]._pIFlags & ISPL_FASTRECOVER && frame == 3) {
plr[pnum].AnimInfo._pAnimFrame++;
plr[pnum].AnimInfo.CurrentFrame++;
}
if (plr[pnum]._pIFlags & ISPL_FASTERRECOVER && (frame == 3 || frame == 5)) {
plr[pnum].AnimInfo._pAnimFrame++;
plr[pnum].AnimInfo.CurrentFrame++;
}
if (plr[pnum]._pIFlags & ISPL_FASTESTRECOVER && (frame == 1 || frame == 3 || frame == 5)) {
plr[pnum].AnimInfo._pAnimFrame++;
plr[pnum].AnimInfo.CurrentFrame++;
}
if (plr[pnum].AnimInfo._pAnimFrame >= plr[pnum]._pHFrames) {
if (plr[pnum].AnimInfo.CurrentFrame >= plr[pnum]._pHFrames) {
StartStand(pnum, plr[pnum]._pdir);
ClearPlrPVars(pnum);
if (GenerateRnd(4) != 0) {
@ -3179,8 +3179,8 @@ bool PM_DoDeath(int pnum)
}
}
plr[pnum].AnimInfo._pAnimDelay = 10000;
plr[pnum].AnimInfo._pAnimFrame = plr[pnum].AnimInfo._pAnimLen;
plr[pnum].AnimInfo.DelayLen = 10000;
plr[pnum].AnimInfo.CurrentFrame = plr[pnum].AnimInfo.FrameLen;
dFlags[plr[pnum].position.tile.x][plr[pnum].position.tile.y] |= BFLAG_DEAD_PLAYER;
}
@ -3437,7 +3437,7 @@ void CheckNewPath(int pnum)
return;
}
if (plr[pnum]._pmode == PM_ATTACK && plr[pnum].AnimInfo._pAnimFrame > plr[myplr]._pAFNum) {
if (plr[pnum]._pmode == PM_ATTACK && plr[pnum].AnimInfo.CurrentFrame > plr[myplr]._pAFNum) {
if (plr[pnum].destAction == ACTION_ATTACK) {
d = GetDirection(plr[pnum].position.future, { plr[pnum].destParam1, plr[pnum].destParam2 });
StartAttack(pnum, d);
@ -3476,7 +3476,7 @@ void CheckNewPath(int pnum)
}
}
if (plr[pnum]._pmode == PM_RATTACK && plr[pnum].AnimInfo._pAnimFrame > plr[myplr]._pAFNum) {
if (plr[pnum]._pmode == PM_RATTACK && plr[pnum].AnimInfo.CurrentFrame > plr[myplr]._pAFNum) {
if (plr[pnum].destAction == ACTION_RATTACK) {
d = GetDirection(plr[pnum].position.tile, { plr[pnum].destParam1, plr[pnum].destParam2 });
StartRangeAttack(pnum, d, plr[pnum].destParam1, plr[pnum].destParam2);
@ -3494,7 +3494,7 @@ void CheckNewPath(int pnum)
}
}
if (plr[pnum]._pmode == PM_SPELL && plr[pnum].AnimInfo._pAnimFrame > plr[pnum]._pSFNum) {
if (plr[pnum]._pmode == PM_SPELL && plr[pnum].AnimInfo.CurrentFrame > plr[pnum]._pSFNum) {
if (plr[pnum].destAction == ACTION_SPELL) {
d = GetDirection(plr[pnum].position.tile, { plr[pnum].destParam1, plr[pnum].destParam2 });
StartSpell(pnum, d, plr[pnum].destParam1, plr[pnum].destParam2);
@ -3714,14 +3714,14 @@ void ProcessPlayers()
void ProcessPlayerAnimation(int pnum)
{
plr[pnum].AnimInfo._pAnimCnt++;
plr[pnum].AnimInfo._pAnimGameTicksSinceSequenceStarted++;
if (plr[pnum].AnimInfo._pAnimCnt > plr[pnum].AnimInfo._pAnimDelay) {
plr[pnum].AnimInfo._pAnimCnt = 0;
plr[pnum].AnimInfo._pAnimFrame++;
if (plr[pnum].AnimInfo._pAnimFrame > plr[pnum].AnimInfo._pAnimLen) {
plr[pnum].AnimInfo._pAnimFrame = 1;
plr[pnum].AnimInfo._pAnimGameTicksSinceSequenceStarted = 0;
plr[pnum].AnimInfo.DelayCounter++;
plr[pnum].AnimInfo.GameTicksSinceSequenceStarted++;
if (plr[pnum].AnimInfo.DelayCounter > plr[pnum].AnimInfo.DelayLen) {
plr[pnum].AnimInfo.DelayCounter = 0;
plr[pnum].AnimInfo.CurrentFrame++;
if (plr[pnum].AnimInfo.CurrentFrame > plr[pnum].AnimInfo.FrameLen) {
plr[pnum].AnimInfo.CurrentFrame = 1;
plr[pnum].AnimInfo.GameTicksSinceSequenceStarted = 0;
}
}
}
@ -3732,22 +3732,22 @@ int GetFrameToUseForPlayerRendering(const PlayerStruct *pPlayer)
// - if no frame-skipping is required and so we have exactly one Animationframe per GameTick
// or
// - if we load from a savegame where the new variables are not stored (we don't want to break savegame compatiblity because of smoother rendering of one animation)
int relevantAnimationFramesForDistributing = pPlayer->AnimInfo._pAnimRelevantAnimationFramesForDistributing;
int relevantAnimationFramesForDistributing = pPlayer->AnimInfo.RelevantFramesForDistributing;
if (relevantAnimationFramesForDistributing <= 0)
return pPlayer->AnimInfo._pAnimFrame;
return pPlayer->AnimInfo.CurrentFrame;
if (pPlayer->AnimInfo._pAnimFrame > relevantAnimationFramesForDistributing)
return pPlayer->AnimInfo._pAnimFrame;
if (pPlayer->AnimInfo.CurrentFrame > relevantAnimationFramesForDistributing)
return pPlayer->AnimInfo.CurrentFrame;
assert(pPlayer->AnimInfo._pAnimGameTicksSinceSequenceStarted >= 0);
assert(pPlayer->AnimInfo.GameTicksSinceSequenceStarted >= 0);
float progressToNextGameTick = gfProgressToNextGameTick;
// we don't use the processed game ticks alone but also the fragtion of the next game tick (if a rendering happens between game ticks). This helps to smooth the animations.
float totalGameTicksForCurrentAnimationSequence = progressToNextGameTick + (float)pPlayer->AnimInfo._pAnimGameTicksSinceSequenceStarted;
float totalGameTicksForCurrentAnimationSequence = progressToNextGameTick + (float)pPlayer->AnimInfo.GameTicksSinceSequenceStarted;
// 1 added for rounding reasons. float to int cast always truncate.
int absoluteAnimationFrame = 1 + (int)(totalGameTicksForCurrentAnimationSequence * pPlayer->AnimInfo._pAnimGameTickModifier);
int absoluteAnimationFrame = 1 + (int)(totalGameTicksForCurrentAnimationSequence * pPlayer->AnimInfo.GameTickModifier);
if (absoluteAnimationFrame > relevantAnimationFramesForDistributing) {
// this can happen if we are at the last frame and the next game tick is due (nthread_GetProgressToNextGameTick returns 1.0f)
if (absoluteAnimationFrame > (relevantAnimationFramesForDistributing + 1)) {
@ -3966,21 +3966,21 @@ void SyncPlrAnim(int pnum)
dir = plr[pnum]._pdir;
switch (plr[pnum]._pmode) {
case PM_STAND:
plr[pnum].AnimInfo._pAnimData = plr[pnum]._pNAnim[dir];
plr[pnum].AnimInfo.pData = plr[pnum]._pNAnim[dir];
break;
case PM_WALK:
case PM_WALK2:
case PM_WALK3:
plr[pnum].AnimInfo._pAnimData = plr[pnum]._pWAnim[dir];
plr[pnum].AnimInfo.pData = plr[pnum]._pWAnim[dir];
break;
case PM_ATTACK:
plr[pnum].AnimInfo._pAnimData = plr[pnum]._pAAnim[dir];
plr[pnum].AnimInfo.pData = plr[pnum]._pAAnim[dir];
break;
case PM_RATTACK:
plr[pnum].AnimInfo._pAnimData = plr[pnum]._pAAnim[dir];
plr[pnum].AnimInfo.pData = plr[pnum]._pAAnim[dir];
break;
case PM_BLOCK:
plr[pnum].AnimInfo._pAnimData = plr[pnum]._pBAnim[dir];
plr[pnum].AnimInfo.pData = plr[pnum]._pBAnim[dir];
break;
case PM_SPELL:
if (pnum == myplr)
@ -3988,23 +3988,23 @@ void SyncPlrAnim(int pnum)
else
sType = STYPE_FIRE;
if (sType == STYPE_FIRE)
plr[pnum].AnimInfo._pAnimData = plr[pnum]._pFAnim[dir];
plr[pnum].AnimInfo.pData = plr[pnum]._pFAnim[dir];
if (sType == STYPE_LIGHTNING)
plr[pnum].AnimInfo._pAnimData = plr[pnum]._pLAnim[dir];
plr[pnum].AnimInfo.pData = plr[pnum]._pLAnim[dir];
if (sType == STYPE_MAGIC)
plr[pnum].AnimInfo._pAnimData = plr[pnum]._pTAnim[dir];
plr[pnum].AnimInfo.pData = plr[pnum]._pTAnim[dir];
break;
case PM_GOTHIT:
plr[pnum].AnimInfo._pAnimData = plr[pnum]._pHAnim[dir];
plr[pnum].AnimInfo.pData = plr[pnum]._pHAnim[dir];
break;
case PM_NEWLVL:
plr[pnum].AnimInfo._pAnimData = plr[pnum]._pNAnim[dir];
plr[pnum].AnimInfo.pData = plr[pnum]._pNAnim[dir];
break;
case PM_DEATH:
plr[pnum].AnimInfo._pAnimData = plr[pnum]._pDAnim[dir];
plr[pnum].AnimInfo.pData = plr[pnum]._pDAnim[dir];
break;
case PM_QUIT:
plr[pnum].AnimInfo._pAnimData = plr[pnum]._pNAnim[dir];
plr[pnum].AnimInfo.pData = plr[pnum]._pNAnim[dir];
break;
default:
app_fatal("SyncPlrAnim");

2
Source/scrollrt.cpp
Unescape View File

@ -416,7 +416,7 @@ static void DrawPlayer(const CelOutputBuffer &out, int pnum, int x, int y, int p
PlayerStruct *pPlayer = &plr[pnum];
BYTE *pCelBuff = pPlayer->AnimInfo._pAnimData;
BYTE *pCelBuff = pPlayer->AnimInfo.pData;
int nCel = GetFrameToUseForPlayerRendering(pPlayer);
int nWidth = pPlayer->_pAnimWidth;

20
test/animationinfo_test.cpp
Unescape View File

@ -62,10 +62,10 @@ void RunAnimationTest(int numFrames, int delay, AnimationDistributionParams para
if (gameTickData != nullptr) {
currentGameTick += 1;
if (gameTickData->_FramesToSkip != 0)
pPlayer->AnimInfo._pAnimFrame += gameTickData->_FramesToSkip;
pPlayer->AnimInfo.CurrentFrame += gameTickData->_FramesToSkip;
ProcessPlayerAnimation(pnum);
EXPECT_EQ(pPlayer->AnimInfo._pAnimFrame, gameTickData->_ExpectedAnimationFrame);
EXPECT_EQ(pPlayer->AnimInfo._pAnimCnt, gameTickData->_ExpectedAnimationCnt);
EXPECT_EQ(pPlayer->AnimInfo.CurrentFrame, gameTickData->_ExpectedAnimationFrame);
EXPECT_EQ(pPlayer->AnimInfo.DelayCounter, gameTickData->_ExpectedAnimationCnt);
}
auto renderingData = dynamic_cast<RenderingData *>(x);
@ -74,8 +74,8 @@ void RunAnimationTest(int numFrames, int delay, AnimationDistributionParams para
EXPECT_EQ(GetFrameToUseForPlayerRendering(pPlayer), renderingData->_ExpectedRenderingFrame)
<< std::fixed << std::setprecision(2)
<< "ProgressToNextGameTick: " << renderingData->_fProgressToNextGameTick
<< " AnimFrame: " << pPlayer->AnimInfo._pAnimFrame
<< " AnimCnt: " << pPlayer->AnimInfo._pAnimCnt
<< " CurrentFrame: " << pPlayer->AnimInfo.CurrentFrame
<< " DelayCounter: " << pPlayer->AnimInfo.DelayCounter
<< " GameTick: " << currentGameTick;
}
}
@ -142,7 +142,7 @@ TEST(AnimationInfo, AttackSwordWarrior) // ProcessAnimationPending should be con
new RenderingData(0.6f, 15),
new GameTickData(16, 0),
new RenderingData(0.6f, 16),
// Animation stopped cause PM_DoAttack would stop the Animation "if (plr[pnum]._pAnimFrame == plr[pnum]._pAFrames) {"
// Animation stopped cause PM_DoAttack would stop the Animation "if (plr[pnum].AnimInfo.CurrentFrame == plr[pnum]._pAFrames) {"
});
}
@ -194,7 +194,7 @@ TEST(AnimationInfo, AttackSwordWarriorWithFastestAttack) // Skipped frames and P
new RenderingData(0.6f, 15),
new GameTickData(16, 0),
new RenderingData(0.6f, 16),
// Animation stopped cause PM_DoAttack would stop the Animation "if (plr[pnum]._pAnimFrame == plr[pnum]._pAFrames) {"
// Animation stopped cause PM_DoAttack would stop the Animation "if (plr[pnum].AnimInfo.CurrentFrame == plr[pnum]._pAFrames) {"
});
}
@ -221,7 +221,7 @@ TEST(AnimationInfo, BlockingWarriorNormal) // Ignored delay for last Frame shoul
new RenderingData(0.3f, 2),
new RenderingData(0.6f, 2),
new RenderingData(0.8f, 2),
// Animation stopped cause PM_DoBlock would stop the Animation "if (plr[pnum]._pAnimFrame >= plr[pnum]._pBFrames) {"
// Animation stopped cause PM_DoBlock would stop the Animation "if (plr[pnum].AnimInfo.CurrentFrame >= plr[pnum]._pBFrames) {"
});
}
@ -248,7 +248,7 @@ TEST(AnimationInfo, BlockingSorcererWithFastBlock) // Skipped frames and ignored
new RenderingData(0.3f, 5),
new RenderingData(0.6f, 6),
new RenderingData(0.8f, 6),
// Animation stopped cause PM_DoBlock would stop the Animation "if (plr[pnum]._pAnimFrame >= plr[pnum]._pBFrames) {"
// Animation stopped cause PM_DoBlock would stop the Animation "if (plr[pnum].AnimInfo.CurrentFrame >= plr[pnum]._pBFrames) {"
});
}
@ -275,7 +275,7 @@ TEST(AnimationInfo, HitRecoverySorcererZenMode) // Skipped frames and ignored de
new RenderingData(0.3f, 7),
new RenderingData(0.6f, 8),
new RenderingData(0.8f, 8),
// Animation stopped cause PM_DoGotHit would stop the Animation "if (plr[pnum]._pAnimFrame >= plr[pnum]._pHFrames) {"
// Animation stopped cause PM_DoGotHit would stop the Animation "if (plr[pnum].AnimInfo.CurrentFrame >= plr[pnum]._pHFrames) {"
});
}
TEST(AnimationInfo, Stand) // Distribution Logic shouldn't change anything here

4
test/player_test.cpp
Unescape View File

@ -11,7 +11,7 @@ extern bool PM_DoGotHit(int pnum);
int RunBlockTest(int frames, int flags)
{
int pnum = 0;
plr[pnum].AnimInfo._pAnimFrame = 1;
plr[pnum].AnimInfo.CurrentFrame = 1;
plr[pnum]._pHFrames = frames;
plr[pnum].actionFrame = 1;
plr[pnum]._pIFlags = flags;
@ -23,7 +23,7 @@ int RunBlockTest(int frames, int flags)
PM_DoGotHit(pnum);
if (plr[pnum]._pmode != PM_GOTHIT)
break;
plr[pnum].AnimInfo._pAnimFrame++;
plr[pnum].AnimInfo.CurrentFrame++;
}
return i;

8
test/writehero_test.cpp
Unescape View File

@ -292,10 +292,10 @@ static void AssertPlayer(PlayerStruct *pPlayer)
ASSERT_EQ(pPlayer->_pmode, 0);
ASSERT_EQ(Count8(pPlayer->walkpath, MAX_PATH_LENGTH), 25);
ASSERT_EQ(pPlayer->_pgfxnum, 36);
ASSERT_EQ(pPlayer->AnimInfo._pAnimDelay, 3);
ASSERT_EQ(pPlayer->AnimInfo._pAnimCnt, 1);
ASSERT_EQ(pPlayer->AnimInfo._pAnimLen, 20);
ASSERT_EQ(pPlayer->AnimInfo._pAnimFrame, 1);
ASSERT_EQ(pPlayer->AnimInfo.DelayLen, 3);
ASSERT_EQ(pPlayer->AnimInfo.DelayCounter, 1);
ASSERT_EQ(pPlayer->AnimInfo.FrameLen, 20);
ASSERT_EQ(pPlayer->AnimInfo.CurrentFrame, 1);
ASSERT_EQ(pPlayer->_pAnimWidth, 96);
ASSERT_EQ(pPlayer->_pSpell, -1);
ASSERT_EQ(pPlayer->_pSplType, 4);

Write Preview
Loading…
Cancel
Save