libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TWINE: don't advance the animBufferPos twice

Browse Source 
this is already done in stockAnimation()
This commit is contained in:
Martin Gerhardy 2020-12-12 12:11:59 +01:00
parent 86e73c9d97
commit d8645be0b2
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/twine/animations.cpp
View File

@ -293,9 +293,9 @@ int32 Animations::setAnimAtKeyframe(int32 keyframeIdx, const uint8 *animPtr, uin
return 1;
}
int32 Animations::stockAnimation(const uint8 *bodyPtr, AnimTimerDataStruct *animTimerDataPtr) {
void Animations::stockAnimation(const uint8 *bodyPtr, AnimTimerDataStruct *animTimerDataPtr) {
if (!Model::isAnimated(bodyPtr)) {
return 0;
return;
}
uint8 *animPtr = animBufferPos;
@ -329,8 +329,6 @@ int32 Animations::stockAnimation(const uint8 *bodyPtr, AnimTimerDataStruct *anim
if (animBuffer + (560 * 8) + 8 < animBufferPos) {
animBufferPos = animBuffer;
}
return var2;
}
bool Animations::verifyAnimAtKeyframe(int32 animIdx, const uint8 *animPtr, AnimTimerDataStruct *animTimerDataPtr) {
@ -525,10 +523,7 @@ bool Animations::initAnim(AnimationTypes newAnim, int16 animType, AnimationTypes
setAnimAtKeyframe(0, _engine->_resources->animTable[animIndex], _engine->_actor->bodyTable[actor->entity], &actor->animTimerData);
} else {
// interpolation between animations
animBufferPos += stockAnimation(_engine->_actor->bodyTable[actor->entity], &actor->animTimerData);
if (animBuffer + (560 * 8) + 8 < animBufferPos) {
animBufferPos = animBuffer;
}
stockAnimation(_engine->_actor->bodyTable[actor->entity], &actor->animTimerData);
}
actor->previousAnimIdx = animIndex;

2
engines/twine/animations.h
View File

@ -116,7 +116,7 @@ public:
* @param bodyPtr Body model poitner
* @param animTimerDataPtr Animation time data
*/
int32 stockAnimation(const uint8 *bodyPtr, AnimTimerDataStruct *animTimerDataPtr);
void stockAnimation(const uint8 *bodyPtr, AnimTimerDataStruct *animTimerDataPtr);
/**
* Initialize animation