TSAGE: Cleanup of code in R2R scene 1000 to use AnimationPlayer

5 files changed, 78 insertions, 114 deletions

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index f872d8edd2..c5f6dc9fb7 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -2457,26 +2457,6 @@ void ScannerDialog::proc12(int visage, int stripFrameNum, int frameNum, int posX
 
 /*--------------------------------------------------------------------------*/
 
-DataManager::DataManager(): EventHandler() {
-
-}
-
-void DataManager::synchronize(Serializer &s) {
-	EventHandler::synchronize(s);
-
-}
-
-void DataManager::load(int v) {
-	warning("TODO");
-}
-
-void DataManager::remove() {
-	if (_endHandler)
-		_endHandler->signal();
-
-	_endHandler = NULL;
-}
-
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 9ea2494124..b740783581 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -392,6 +392,8 @@ public:
 enum AnimationPaletteMode { ANIMPALMODE_REPLACE_PALETTE = 0, ANIMPALMODE_CURR_PALETTE = 1,
 		ANIMPALMODE_NONE = 2 };
 
+enum AnimationObjectMode { ANIMOBJMODE_1 = 1, ANIMOBJMODE_2 = 2, ANIMOBJMODE_42 = 42 };
+
 class AnimationPlayer: public EventHandler {
 private:
 	void rleDecode(const byte *pSrc, byte *pDest, int size);
@@ -406,8 +408,9 @@ public:
 	Common::File _resourceFile;
 	Rect _rect1, _screenBounds;
 	int _field38;
-	int _field3A, _paletteMode;
-	int _objectMode;
+	int _field3A;
+	AnimationPaletteMode _paletteMode;
+	AnimationObjectMode _objectMode;
 	int _field58, _sliceHeight;
 	byte _palIndexes[256];
 	ScenePalette _palette;
@@ -514,25 +517,6 @@ public:
 	void proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY);
 };
 
-class DataManager: public EventHandler {
-public:
-	int _field3C;
-	int _field56;
-
-	int _palStart;
-	int _palLength;
-	byte _palData[256 * 3];
-	EventHandler *_endHandler;
-public:
-	DataManager();
-
-	virtual Common::String getClassName() { return "DataManager"; }
-	virtual void synchronize(Serializer &s);
-	virtual void remove();
-
-	void load(int v);
-};
-
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index b977ea1516..53610ced25 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1554,7 +1554,7 @@ void Scene180::signal() {
 		R2_GLOBALS._sceneManager._hasPalette = true;
 		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
 		_animationPlayer._v = 1;
-		_animationPlayer._objectMode = 1;
+		_animationPlayer._objectMode = ANIMOBJMODE_1;
 		R2_GLOBALS._scene180Mode = 1;
 
 		_animationPlayer.load(1);
@@ -1597,7 +1597,7 @@ void Scene180::signal() {
 	case 5:
 		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
 		_animationPlayer._v = 1;
-		_animationPlayer._objectMode = 1;
+		_animationPlayer._objectMode = ANIMOBJMODE_1;
 		R2_GLOBALS._scene180Mode = 2;
 		_animationPlayer.load(2);
 
@@ -1702,7 +1702,7 @@ void Scene180::signal() {
 		_field412 = 1;
 		_animationPlayer._paletteMode = ANIMPALMODE_REPLACE_PALETTE;
 		_animationPlayer._v = 1;
-		_animationPlayer._objectMode = 42;
+		_animationPlayer._objectMode = ANIMOBJMODE_42;
 		R2_GLOBALS._scene180Mode = 3;
 		_animationPlayer.load(3);
 		break;
@@ -1801,7 +1801,7 @@ void Scene180::signal() {
 
 	case 40:
 		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
-		_animationPlayer._objectMode = 1;
+		_animationPlayer._objectMode = ANIMOBJMODE_1;
 		R2_GLOBALS._scene180Mode = 4;
 		if (_animationPlayer.load(4)) {
 			_animationPlayer.dispatch();
@@ -1840,7 +1840,7 @@ void Scene180::signal() {
 		_field412 = 1;
 		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
 		_animationPlayer._v = 1;
-		_animationPlayer._objectMode = 1;
+		_animationPlayer._objectMode = ANIMOBJMODE_1;
 		R2_GLOBALS._scene180Mode = 15;
 		_animationPlayer.load(15, NULL);
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index ffc491725e..a23db73b7f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -106,13 +106,13 @@ void Scene1000::signal() {
 		R2_GLOBALS._fontColors.background = 224;
 		R2_GLOBALS._fontColors.foreground = 119;
 
-		_dataManager._field56 = 2;
-		_dataManager._field3C = 2;
-		_dataManager.load(5);
-		R2_GLOBALS._scenePalette.loadPalette(_dataManager._palData, 0, 256);
+		_animationPlayer._objectMode = ANIMOBJMODE_2;
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer.load(5);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 		R2_GLOBALS._sceneManager._hasPalette = false;
 
-		_dataManager.dispatch();
+		_animationPlayer.dispatch();
 		_fieldD2E = 1;
 		
 		R2_GLOBALS._scenePalette.fade((const byte *)&black, true, 0);
@@ -163,13 +163,13 @@ void Scene1000::signal() {
 		for (int percent = 100; percent >= 0; percent += 5)
 			R2_GLOBALS._scenePalette.fade((const byte *)&black, true, percent);
 
-		_dataManager._field3C = 2;
-		_dataManager._field56 = 2;
-		_dataManager.load(7);
-		R2_GLOBALS._scenePalette.loadPalette(_dataManager._palData, 0, 256);
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer._objectMode = ANIMOBJMODE_2;
+		_animationPlayer.load(7);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 		R2_GLOBALS._sceneManager._hasPalette = false;
 
-		_dataManager.dispatch();
+		_animationPlayer.dispatch();
 
 		_fieldD2E = 1;
 		R2_GLOBALS._scenePalette.fade((const byte *)&black, 1, 0);
@@ -193,13 +193,13 @@ void Scene1000::signal() {
 		break;
 
 	case 10:
-		_dataManager._field3C = 2;
-		_dataManager._field56 = 2;
-		_dataManager.load(6);
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer._objectMode = ANIMOBJMODE_2;
+		_animationPlayer.load(6);
 
-		R2_GLOBALS._scenePalette.loadPalette(_dataManager._palData, 0, 256);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 		R2_GLOBALS._sceneManager._hasPalette = false;
-		_dataManager.dispatch();
+		_animationPlayer.dispatch();
 
 		_fieldD2E = 1;
 		R2_GLOBALS._scenePalette.fade((const byte *)&black, 1, 0);
@@ -210,18 +210,18 @@ void Scene1000::signal() {
 		break;
 
 	case 11:
-		R2_GLOBALS._scenePalette.loadPalette(NULL);
+		R2_GLOBALS._scenePalette.loadPalette(0);
 		R2_GLOBALS._sceneManager.changeScene(300);
 		break;
 
 	case 20:
-		_dataManager._field3C = 2;
-		_dataManager._field56 = 2;
-		_dataManager.load(8);
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer._objectMode = ANIMOBJMODE_2;
+		_animationPlayer.load(8);
 
-		R2_GLOBALS._scenePalette.loadPalette(_dataManager._palData, 0, 256);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 		R2_GLOBALS._sceneManager._hasPalette = false;
-		_dataManager.dispatch();
+		_animationPlayer.dispatch();
 
 		_fieldD2E = 1;
 		R2_GLOBALS._scenePalette.fade((const byte *)&black, 1, 0);
@@ -230,18 +230,18 @@ void Scene1000::signal() {
 		break;
 
 	case 21:
-		R2_GLOBALS._scenePalette.loadPalette(NULL);
+		R2_GLOBALS._scenePalette.loadPalette(0);
 		R2_GLOBALS._sceneManager.changeScene(1530);
 		break;
 
 	case 30:
-		_dataManager._field3C = 2;
-		_dataManager._field56 = 2;
-		_dataManager.load(17);
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer._objectMode = ANIMOBJMODE_2;
+		_animationPlayer.load(17);
 
-		R2_GLOBALS._scenePalette.loadPalette(_dataManager._palData, 0, 256);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 		R2_GLOBALS._sceneManager._hasPalette = false;
-		_dataManager.dispatch();
+		_animationPlayer.dispatch();
 
 		_fieldD2E = 1;
 		R2_GLOBALS._scenePalette.fade((const byte *)&black, 1, 0);
@@ -260,13 +260,13 @@ void Scene1000::signal() {
 		break;
 
 	case 40:
-		_dataManager._field3C = 2;
-		_dataManager._field56 = 2;
-		_dataManager.load(18);
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer._objectMode = ANIMOBJMODE_2;
+		_animationPlayer.load(18);
 
-		R2_GLOBALS._scenePalette.loadPalette(_dataManager._palData, 0, 256);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 		R2_GLOBALS._sceneManager._hasPalette = false;
-		_dataManager.dispatch();
+		_animationPlayer.dispatch();
 
 		_fieldD2E = 1;
 		R2_GLOBALS._scenePalette.fade((const byte *)&black, 1, 0);
@@ -286,13 +286,13 @@ void Scene1000::signal() {
 		for (int percent = 100; percent >= 0; percent += 5)
 			R2_GLOBALS._scenePalette.fade((const byte *)&black, true, percent);
 
-		_dataManager._field3C = 2;
-		_dataManager._field56 = 2;
-		_dataManager.load(13);
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer._objectMode = ANIMOBJMODE_2;
+		_animationPlayer.load(13);
 
-		R2_GLOBALS._scenePalette.loadPalette(_dataManager._palData, 0, 256);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 		R2_GLOBALS._sceneManager._hasPalette = false;
-		_dataManager.dispatch();
+		_animationPlayer.dispatch();
 
 		_fieldD2E = 1;
 		R2_GLOBALS._scenePalette.fade((const byte *)&black, 1, 0);
@@ -308,13 +308,13 @@ void Scene1000::signal() {
 		for (int percent = 100; percent >= 0; percent += 5)
 			R2_GLOBALS._scenePalette.fade((const byte *)&black, true, percent);
 
-		_dataManager._field3C = 2;
-		_dataManager._field56 = 2;
-		_dataManager.load(14);
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer._objectMode = ANIMOBJMODE_2;
+		_animationPlayer.load(14);
 
-		R2_GLOBALS._scenePalette.loadPalette(_dataManager._palData, 0, 256);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 		R2_GLOBALS._sceneManager._hasPalette = false;
-		_dataManager.dispatch();
+		_animationPlayer.dispatch();
 
 		_fieldD2E = 1;
 		R2_GLOBALS._scenePalette.fade((const byte *)&black, 1, 0);
@@ -335,13 +335,13 @@ void Scene1000::signal() {
 		for (int percent = 100; percent >= 0; percent += 5)
 			R2_GLOBALS._scenePalette.fade((const byte *)&black, true, percent);
 
-		_dataManager._field3C = 2;
-		_dataManager._field56 = 2;
-		_dataManager.load(12);
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer._objectMode = ANIMOBJMODE_2;
+		_animationPlayer.load(12);
 
-		R2_GLOBALS._scenePalette.loadPalette(_dataManager._palData, 0, 256);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 		R2_GLOBALS._sceneManager._hasPalette = false;
-		_dataManager.dispatch();
+		_animationPlayer.dispatch();
 
 		_fieldD2E = 1;
 		R2_GLOBALS._scenePalette.fade((const byte *)&black, 1, 0);
@@ -360,13 +360,13 @@ void Scene1000::signal() {
 		for (int percent = 100; percent >= 0; percent += 5)
 			R2_GLOBALS._scenePalette.fade((const byte *)&black, true, percent);
 
-		_dataManager._field3C = 2;
-		_dataManager._field56 = 2;
-		_dataManager.load(9);
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer._objectMode = ANIMOBJMODE_2;
+		_animationPlayer.load(9);
 
-		R2_GLOBALS._scenePalette.loadPalette(_dataManager._palData, 0, 256);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 		R2_GLOBALS._sceneManager._hasPalette = false;
-		_dataManager.dispatch();
+		_animationPlayer.dispatch();
 
 		_fieldD2E = 1;
 		R2_GLOBALS._scenePalette.fade((const byte *)&black, 1, 0);
@@ -383,13 +383,13 @@ void Scene1000::signal() {
 		break;
 
 	case 80:
-		_dataManager._field3C = 2;
-		_dataManager._field56 = 2;
-		_dataManager.load(10);
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer._objectMode = ANIMOBJMODE_2;
+		_animationPlayer.load(10);
 
-		R2_GLOBALS._scenePalette.loadPalette(_dataManager._palData, 0, 256);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 		R2_GLOBALS._sceneManager._hasPalette = false;
-		_dataManager.dispatch();
+		_animationPlayer.dispatch();
 
 		_fieldD2E = 1;
 		R2_GLOBALS._scenePalette.fade((const byte *)&black, 1, 0);
@@ -401,13 +401,13 @@ void Scene1000::signal() {
 		break;
 
 	case 90:
-		_dataManager._field3C = 2;
-		_dataManager._field56 = 2;
-		_dataManager.load(11);
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer._objectMode = ANIMOBJMODE_2;
+		_animationPlayer.load(11);
 
-		R2_GLOBALS._scenePalette.loadPalette(_dataManager._palData, 0, 256);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 		R2_GLOBALS._sceneManager._hasPalette = false;
-		_dataManager.dispatch();
+		_animationPlayer.dispatch();
 
 		_fieldD2E = 1;
 		R2_GLOBALS._scenePalette.fade((const byte *)&black, 1, 0);
@@ -428,13 +428,13 @@ void Scene1000::signal() {
 		R2_GLOBALS._sound1.play(304);
 		R2_GLOBALS._sound2.play(82);
 
-		_dataManager._field3C = 2;
-		_dataManager._field56 = 2;
-		_dataManager.load(19);
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer._objectMode = ANIMOBJMODE_2;
+		_animationPlayer.load(19);
 
-		R2_GLOBALS._scenePalette.loadPalette(_dataManager._palData, 0, 256);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 		R2_GLOBALS._sceneManager._hasPalette = false;
-		_dataManager.dispatch();
+		_animationPlayer.dispatch();
 
 		_fieldD2E = 1;
 		R2_GLOBALS._scenePalette.fade((const byte *)&black, 1, 0);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 4ee0c29f4f..23ebb2c276 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -44,7 +44,7 @@ public:
 	SequenceManager _sequenceManager1;
 	SequenceManager _sequenceManager2;
 	SpeakerGameText _gameTextSpeaker;
-	DataManager _dataManager;
+	AnimationPlayer _animationPlayer;
 
 	int _field412;
 	int _fieldD2E;