ACCESS: Replace doOpening by mWhileDoOpen, move openObj to Amazon Resources

6 files changed, 20 insertions, 26 deletions

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index d110a6cf44..e9c42d0647 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -122,7 +122,7 @@ void AmazonEngine::doIntroduction() {
 		return;
 
 	_screen->setPanel(3);
-	doOpening();
+	((AmazonScripts *)_scripts)->mWhileDoOpen();
 
 	if (shouldQuit() || _skipStart)
 		return;
@@ -341,10 +341,6 @@ void AmazonEngine::doTitle() {
 	}
 }
 
-void AmazonEngine::doOpening() {
-	warning("TODO doOpening");
-}
-
 void AmazonEngine::doTent() {
 	warning("TODO doTent");
 }
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 34a1eef775..ba81a77658 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -81,11 +81,6 @@ private:
 	void doTitle();
 
 	/**
-	 * Do opening sequence
-	 */
-	void doOpening();
-
-	/**
 	 * Do tent scene of introduction
 	 */
 	void doTent();
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 5768be3c33..925ea195a5 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1524,5 +1524,18 @@ const int TORCH[12] = {
 
 const int SPEAR[3] = {30, -13, 1};
 
+const int openObj[10][4] = {
+	{8, -80, 120, 30},
+	{13, 229, 0, 50},
+	{12, 78, 0, 50},
+	{11, 10, 0, 50},
+	{10, 178, 97, 50},
+	{9, 92, 192, 50},
+	{14, 38, 0, 100},
+	{15, 132, 76, 100},
+	{16, 142, 0, 100},
+	{4, -280, 40, 120},
+};
+
 } // End of namespace Amazon
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 0d65a569c7..434a0f37db 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -81,6 +81,8 @@ extern const int PITSTAB[21];
 extern const int TORCH[12];
 
 extern const int SPEAR[3];
+
+extern const int openObj[10][4];
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index ae7e047fb8..f97d789f5f 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -540,19 +540,6 @@ void AmazonScripts::mWhileDoOpen() {
 	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
 
-	const int openObj[10][4] = {
-		{8, -80, 120, 30},
-		{13, 229, 0, 50},
-		{12, 78, 0, 50},
-		{11, 10, 0, 50},
-		{10, 178, 97, 50},
-		{9, 92, 192, 50},
-		{14, 38, 0, 100},
-		{15, 132, 76, 100},
-		{16, 142, 0, 100},
-		{4, -280, 40, 120},
-	};
-
 	screen.setBufferScan();
 	events.hideCursor();
 	screen.forceFadeOut();
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index c7b72a651e..67e7e77009 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -35,16 +35,16 @@ class AmazonEngine;
 class AmazonScripts: public Scripts {
 private:
 	AmazonEngine *_game;
-
 	int _xTrack;
 	int _yTrack;
 	int _zTrack;
 	int _xCam;
 	int _yCam;
 	int _zCam;
-
 	int _pNumObj;
+
 	int _pImgNum[32];
+
 	SpriteResource *_pObject[32];
 
 	int _pObjX[32];
@@ -70,7 +70,6 @@ protected:
 	void mWhileFly();
 	void mWhileFall();
 	void mWhileJWalk();
-	void mWhileDoOpen();
 	void mWhile(int param1);
 	void setVerticalCode(Common::Rect bounds);
 	void setHorizontalCode(Common::Rect bounds);
@@ -99,6 +98,8 @@ protected:
 	void CMDRETFLASH();
 public:
 	AmazonScripts(AccessEngine *vm);
+
+	void mWhileDoOpen();
 };
 
 } // End of namespace Amazon