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

[Strangerke]

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

Summary:
6f5cc20c9c TSAGE: R2R - Fix several uses of ANIM_MODE_8 & 9
e9015d4540 TSAGE: BF - Fix several uses of ANIM_MODE_8 & 9


Commit: 6f5cc20c9c2f1e47dfe7c2ef30126c848cf90498
    https://github.com/scummvm/scummvm/commit/6f5cc20c9c2f1e47dfe7c2ef30126c848cf90498
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-12-19T22:19:07-08:00

Commit Message:
TSAGE: R2R - Fix several uses of ANIM_MODE_8 & 9

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index e977562..26b423f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -11490,7 +11490,7 @@ void Scene1800::signal() {
 		_sceneMode = 14;
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 		R2_GLOBALS._player.setup(1801, 7, 1);
-		R2_GLOBALS._player.animate(ANIM_MODE_8, NULL);
+		R2_GLOBALS._player.animate(ANIM_MODE_8, 0, NULL);
 		_stripManager.start(550, this);
 		break;
 	case 14:
@@ -11510,7 +11510,7 @@ void Scene1800::signal() {
 		_sceneMode = 24;
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 		R2_GLOBALS._player.setup(1801, 5, 1);
-		R2_GLOBALS._player.animate(ANIM_MODE_8, NULL);
+		R2_GLOBALS._player.animate(ANIM_MODE_8, 0, NULL);
 		_stripManager.start(550, this);
 		break;
 	case 24:
@@ -15182,7 +15182,7 @@ void Scene1950::signal() {
 		R2_GLOBALS._player.disableControl(CURSOR_WALK);
 		R2_GLOBALS._player._canWalk = true;
 		R2_GLOBALS._player.setVisage(22);
-		R2_GLOBALS._player.animate(ANIM_MODE_9, NULL);
+		R2_GLOBALS._player.animate(ANIM_MODE_9);
 		Common::Point pt(340, 160);
 		NpcMover *mover = new NpcMover();
 		R2_GLOBALS._player.addMover(mover, &pt, this);
@@ -15198,7 +15198,7 @@ void Scene1950::signal() {
 		R2_GLOBALS._player.disableControl(CURSOR_WALK);
 		R2_GLOBALS._player._canWalk = true;
 		R2_GLOBALS._player.setVisage(22);
-		R2_GLOBALS._player.animate(ANIM_MODE_9, NULL);
+		R2_GLOBALS._player.animate(ANIM_MODE_9);
 		Common::Point pt(-20, 160);
 		NpcMover *mover = new NpcMover();
 		R2_GLOBALS._player.addMover(mover, &pt, this);


Commit: e9015d4540e023a5625e91aa1b8d4de0d61c426c
    https://github.com/scummvm/scummvm/commit/e9015d4540e023a5625e91aa1b8d4de0d61c426c
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-12-19T22:19:22-08:00

Commit Message:
TSAGE: BF - Fix several uses of ANIM_MODE_8 & 9

Changed paths:
    engines/tsage/blue_force/blueforce_scenes2.cpp



diff --git a/engines/tsage/blue_force/blueforce_scenes2.cpp b/engines/tsage/blue_force/blueforce_scenes2.cpp
index 1b0ed2a..e444c8b 100644
--- a/engines/tsage/blue_force/blueforce_scenes2.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes2.cpp
@@ -1748,7 +1748,7 @@ void Scene280::Action1::signal() {
 	case 1:
 		scene->_jake.setStrip(2);
 		scene->_jake.setFrame(1);
-		scene->_jake.animate(ANIM_MODE_8, NULL);
+		scene->_jake.animate(ANIM_MODE_8, 0, NULL);
 		scene->_jake._numFrames = 5;
 
 		scene->_stripManager.start(2800, this);