[Scummvm-cvs-logs] scummvm master -> 5910c8afa9c56ef808bb0cd61b28baba7b45e349

[dreammaster]

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:
ca7b85bfd8 CGE: Fix compiler warnings
5910c8afa9 TSAGE: Implemented the new ANIM_MODE_9 animation mode


Commit: ca7b85bfd8fd868b6675abf57b7a23ad1dc70d3e
    https://github.com/scummvm/scummvm/commit/ca7b85bfd8fd868b6675abf57b7a23ad1dc70d3e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-08-26T03:06:22-07:00

Commit Message:
CGE: Fix compiler warnings

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



diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index 696945b..e49037a 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -101,8 +101,8 @@ void Scene300::Action1::signal() {
 		setDelay(1);
 		break;
 	case 2: {
-		Common::Point pt(BF_GLOBALS._player._position.x - 8, BF_GLOBALS._player._position.y);
-		ADD_PLAYER_MOVER_THIS(BF_GLOBALS._player, pt.x, pt.y);
+		ADD_PLAYER_MOVER_THIS(BF_GLOBALS._player, BF_GLOBALS._player._position.x - 8, 
+			BF_GLOBALS._player._position.y);
 		break;
 	}
 	case 3:
@@ -125,8 +125,8 @@ void Scene300::Action2::signal() {
 		setDelay(1);
 		break;
 	case 2: {
-		Common::Point pt(BF_GLOBALS._player._position.x + 8, BF_GLOBALS._player._position.y);
-		ADD_MOVER(BF_GLOBALS._player, pt.x, pt.y);
+		ADD_MOVER(BF_GLOBALS._player, BF_GLOBALS._player._position.x + 8,
+			BF_GLOBALS._player._position.y);
 		break;
 	}
 	case 3:


Commit: 5910c8afa9c56ef808bb0cd61b28baba7b45e349
    https://github.com/scummvm/scummvm/commit/5910c8afa9c56ef808bb0cd61b28baba7b45e349
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-08-26T03:06:43-07:00

Commit Message:
TSAGE: Implemented the new ANIM_MODE_9 animation mode

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 49abf29..aef9492 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2072,6 +2072,7 @@ void SceneObject::animate(AnimateMode animMode, ...) {
 		break;
 
 	case ANIM_MODE_8:
+	case ANIM_MODE_9:
 		_field68 = va_arg(va, int);
 		_endAction = va_arg(va, Action *);
 		_frameChange = 1;
@@ -2258,7 +2259,23 @@ void SceneObject::dispatch() {
 			} else {
 				setFrame(changeFrame());
 			}
+			break;
 
+		case ANIM_MODE_9:
+			if (_frame == _endFrame) {
+				if (_frameChange != -1) {
+					_frameChange = -1;
+					_strip = (_strip - 1) ^ 1 + 1;
+					_endFrame = 1;
+				} else if ((_field68 == 0) || (--_field68 != 0)) {
+					_frameChange = 1;
+					_endFrame = getFrameCount();
+
+					setFrame(changeFrame());
+				}
+			} else {
+				setFrame(changeFrame());
+			}
 			break;
 
 		default: