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

MADS: Fix proper cycling of idle animations

Browse Source
This commit is contained in:
Paul Gilbert 2015-02-15 11:07:33 -05:00
parent 7739e12e42
commit db325695f4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/mads/player.cpp
View File

@ -235,11 +235,12 @@ void Player::selectSeries() {
void Player::updateFrame() {
// WORKAROUND: Prevent character info being referenced when not present
if ((_spritesStart + _spritesIdx) < 0 || !_spriteSetsPresent[_spritesStart + _spritesIdx])
int idx = _spritesStart + _spritesIdx;
if (idx < 0 || (idx < PLAYER_SPRITES_FILE_COUNT && !_spriteSetsPresent[idx]))
return;
Scene &scene = _vm->_game->_scene;
SpriteAsset &spriteSet = *scene._sprites[_spritesStart + _spritesIdx];
SpriteAsset &spriteSet = *scene._sprites[idx];
assert(spriteSet._charInfo);
if (!spriteSet._charInfo->_numEntries) {
@ -529,11 +530,11 @@ void Player::idle() {
_frameNumber += direction;
_forceRefresh = true;
if (spriteSet._charInfo->_stopFrames[frameIndex] < _frameNumber) {
if (_frameNumber > spriteSet._charInfo->_stopFrames[frameIndex]) {
_trigger = _upcomingTrigger;
updateFrame();
}
if (spriteSet._charInfo->_startFrames[frameIndex] < _frameNumber) {
if (_frameNumber < spriteSet._charInfo->_startFrames[frameIndex]) {
_trigger = _upcomingTrigger;
updateFrame();
}