[Scummvm-cvs-logs] scummvm master -> db325695f42e2dec3163b9a371085d8561e5a42a

dreammaster dreammaster at scummvm.org
Sun Feb 15 17:08:58 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
db325695f4 MADS: Fix proper cycling of idle animations


Commit: db325695f42e2dec3163b9a371085d8561e5a42a
    https://github.com/scummvm/scummvm/commit/db325695f42e2dec3163b9a371085d8561e5a42a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-02-15T11:07:33-05:00

Commit Message:
MADS: Fix proper cycling of idle animations

Changed paths:
    engines/mads/player.cpp



diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index e7993f3..1622031 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -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();
 		}






More information about the Scummvm-git-logs mailing list