ACCESS: Add a second parameter to doEstablish()

scummvm · Aug 16, 2014 · 8648480 · 8648480
1 parent 0b0d16d
commit 8648480
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/engines/access/access.cpp b/engines/access/access.cpp
@@ -202,24 +202,24 @@ void AccessEngine::freeInactiveData() {
 	_inactive = nullptr;
 }
 
-void AccessEngine::establish(int v) {
+void AccessEngine::establish(int v1, int v2) {
 	_establishMode = 0;
 	_establishGroup = 0;
-	doEstablish(v);
+	doEstablish(v1, v2);
 }
 
-void AccessEngine::establishCenter(int v) {
+void AccessEngine::establishCenter(int v1, int v2) {
 	_establishMode = 1;
-	doEstablish(v);
+	doEstablish(v1, v2);
 }
 
-void AccessEngine::doEstablish(int v) {
+void AccessEngine::doEstablish(int v1, int v2) {
 	_screen->forceFadeOut();
 	_screen->clearScreen();
 	_screen->setPanel(3);
 
-	if (v != -1) {
-		_files->loadScreen(95, v);
+	if (v1 != -1) {
+		_files->loadScreen(95, v1);
 		_buffer2.copyBuffer(_screen);
 	}
 

diff --git a/engines/access/access.h b/engines/access/access.h
@@ -84,7 +84,7 @@ class AccessEngine : public Engine {
 
 	void dummyLoop();
 
-	void doEstablish(int v);
+	void doEstablish(int v1, int v2);
 protected:
 	const AccessGameDescription *_gameDescription;
 	Common::RandomSource _randomSource;
@@ -210,9 +210,9 @@ class AccessEngine : public Engine {
 	 */
 	void freeInactiveData();
 
-	void establish(int v);
+	void establish(int v1, int v2);
 
-	void establishCenter(int v);
+	void establishCenter(int v1, int v2);
 
 	void plotList();
 	void plotList1();

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
@@ -34,7 +34,7 @@ AmazonScripts::AmazonScripts(AccessEngine *vm) : Scripts(vm) {
 void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 	switch (commandIndex) {
 	case 1:
-		warning("TODO ESTABLISH");
+		_vm->establish(param1, param2);
 		break;
 	case 2:
 		warning("TODO LOADBACKGROUND");

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
@@ -163,7 +163,7 @@ void Room::loadRoomData(const byte *roomData) {
 		_vm->_establishFlag = true;
 		if (_vm->_establishTable[roomInfo._estIndex] != 1) {
 			_vm->_establishTable[roomInfo._estIndex] = 1;
-			_vm->establish(0);
+			_vm->establish(0, roomInfo._estIndex);
 		}
 	}