[Scummvm-cvs-logs] scummvm master -> 283db7d769eb4cdd2014bd09132e7b06d17e2f4c
dreammaster
dreammaster at scummvm.org
Sat May 31 17:27:51 CEST 2014
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:
283db7d769 MADS: Fix starting to talk to doctor in scene 318
Commit: 283db7d769eb4cdd2014bd09132e7b06d17e2f4c
https://github.com/scummvm/scummvm/commit/283db7d769eb4cdd2014bd09132e7b06d17e2f4c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-05-31T11:27:14-04:00
Commit Message:
MADS: Fix starting to talk to doctor in scene 318
Changed paths:
engines/mads/player.cpp
diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index ed585cf..a78d35d 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -127,7 +127,7 @@ bool Player::loadSprites(const Common::String &prefix) {
setIndex = _vm->_game->_scene._sprites.addSprites(setName, 4);
++_numSprites;
} else if (fileIndex < 5) {
- _highSprites = 0;
+ _highSprites = false;
return true;
} else {
_spriteSetsPresent[fileIndex] = false;
@@ -139,13 +139,13 @@ bool Player::loadSprites(const Common::String &prefix) {
_spritesLoaded = true;
_spritesChanged = false;
- _highSprites = false;
- return false;
} else {
Common::fill(&_spriteSetsPresent[0], &_spriteSetsPresent[PLAYER_SPRITES_FILE_COUNT], false);
- _highSprites = false;
- return false;
+ _visible = false;
}
+
+ _highSprites = false;
+ return false;
}
void Player::setFinalFacing() {
More information about the Scummvm-git-logs
mailing list