aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2014-03-16 16:50:53 -0400
committerPaul Gilbert2014-03-16 16:50:53 -0400
commitd599c7c404729217cf4cf85ee02b2d8b3f3b9ec9 (patch)
tree4cd3ac0bdd819c48cbbd3d83638d90dc94482903 /engines
parent74da0c2ef7a5a77ddfcda26b28ebdeab68a9f8f5 (diff)
downloadscummvm-rg350-d599c7c404729217cf4cf85ee02b2d8b3f3b9ec9.tar.gz
scummvm-rg350-d599c7c404729217cf4cf85ee02b2d8b3f3b9ec9.tar.bz2
scummvm-rg350-d599c7c404729217cf4cf85ee02b2d8b3f3b9ec9.zip
MADS: Fix to display player
Diffstat (limited to 'engines')
-rw-r--r--engines/mads/game.cpp1
-rw-r--r--engines/mads/nebular/game_nebular.cpp2
-rw-r--r--engines/mads/player.cpp4
3 files changed, 4 insertions, 3 deletions
diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index af23998b74..03c0544689 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -89,6 +89,7 @@ void Game::run() {
break;
default:
_scene._nextSceneId = 103;
+ _scene._priorSceneId = 102;
break;
}
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 91c10a50ee..e5c344b738 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -54,7 +54,7 @@ int GameNebular::checkCopyProtection() {
*/
// DEBUG: Return that copy protection failed
- return 0;
+ return -2;
}
void GameNebular::initialiseGlobals() {
diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index c3ce270954..3fc7ca53dd 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -362,8 +362,8 @@ void Player::setDest(const Common::Point &pt, int facing) {
void Player::nextFrame() {
Scene &scene = _vm->_game->_scene;
- _priorTimer += _ticksAmount;
- if (scene._frameStartTime >= _priorTimer) {
+ uint32 newTime = _priorTimer + _ticksAmount;
+ if (scene._frameStartTime >= newTime) {
_priorTimer = scene._frameStartTime;
if (_moving) {
move();