[Scummvm-cvs-logs] SF.net SVN: scummvm:[55628] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 55628
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55628&view=rev
Author:   drmccoy
Date:     2011-01-29 22:44:36 +0000 (Sat, 29 Jan 2011)

Log Message:
-----------
GOB: Rename "skipPlay" to "function" in playTot

Modified Paths:
--------------
    scummvm/trunk/engines/gob/game.cpp
    scummvm/trunk/engines/gob/game.h
    scummvm/trunk/engines/gob/inter_v2.cpp

Modified: scummvm/trunk/engines/gob/game.cpp
===================================================================
--- scummvm/trunk/engines/gob/game.cpp	2011-01-29 22:44:06 UTC (rev 55627)
+++ scummvm/trunk/engines/gob/game.cpp	2011-01-29 22:44:36 UTC (rev 55628)
@@ -321,7 +321,7 @@
 	_startTimeKey = _vm->_util->getTimeKey();
 }
 
-void Game::playTot(int16 skipPlay) {
+void Game::playTot(int16 function) {
 	char savedTotName[20];
 	int16 *oldCaptureCounter;
 	int16 *oldBreakFrom;
@@ -341,12 +341,12 @@
 	_vm->_scenery->_pCaptureCounter = &captureCounter;
 	strcpy(savedTotName, _curTotFile);
 
-	if (skipPlay <= 0) {
+	if (function <= 0) {
 		while (!_vm->shouldQuit()) {
 			if (_vm->_inter->_variables)
 				_vm->_draw->animateCursor(4);
 
-			if (skipPlay != -1) {
+			if (function != -1) {
 				_vm->_inter->initControlVars(1);
 
 				for (int i = 0; i < 4; i++) {
@@ -377,9 +377,9 @@
 			if ((_curTotFile[0] == 0) && (!_script->isLoaded()))
 				break;
 
-			if (skipPlay == -2) {
+			if (function == -2) {
 				_vm->_vidPlayer->closeVideo();
-				skipPlay = 0;
+				function = 0;
 			}
 
 			if (!_script->load(_curTotFile)) {
@@ -423,7 +423,7 @@
 			for (int i = 0; i < *_vm->_scenery->_pCaptureCounter; i++)
 				capturePop(0);
 
-			if (skipPlay != -1) {
+			if (function != -1) {
 				_vm->_goblin->freeObjects();
 
 				_vm->_sound->blasterStop(0);
@@ -449,11 +449,11 @@
 		_vm->_inter->initControlVars(0);
 		_vm->_scenery->_pCaptureCounter = oldCaptureCounter;
 
-		if (skipPlay > 13) {
-			warning("Addy: skipPlay = %d", skipPlay);
-			_script->skip(skipPlay);
+		if (function > 13) {
+			warning("Addy: function = %d", function);
+			_script->skip(function);
 		} else
-			_script->seek(_script->getFunctionOffset(skipPlay + 1));
+			_script->seek(_script->getFunctionOffset(function + 1));
 
 		_vm->_inter->callSub(2);
 
@@ -641,7 +641,7 @@
 	_vm->_draw->_scummvmCursor.reset();
 }
 
-// flagbits: 0 = freeInterVariables, 1 = skipPlay
+// flagbits: 0 = freeInterVariables, 1 = function -1
 void Game::totSub(int8 flags, const char *newTotFile) {
 	int8 curBackupPos;
 
@@ -714,7 +714,7 @@
 	_vm->_global->_inter_animDataSize = _script->getAnimDataSize();
 }
 
-void Game::switchTotSub(int16 index, int16 skipPlay) {
+void Game::switchTotSub(int16 index, int16 function) {
 	int16 backupedCount;
 	int16 curBackupPos;
 
@@ -727,7 +727,7 @@
 
 	// WORKAROUND: Some versions don't make the MOVEMENT menu item unselectable
 	// in the dreamland screen, resulting in a crash when it's clicked.
-	if ((_vm->getGameType() == kGameTypeGob2) && (index == -1) && (skipPlay == 7) &&
+	if ((_vm->getGameType() == kGameTypeGob2) && (index == -1) && (function == 7) &&
 	    !scumm_stricmp(_environments->getTotFile(newPos), "gob06.tot"))
 		return;
 
@@ -750,7 +750,7 @@
 	}
 
 	_hotspots->push(0, true);
-	playTot(skipPlay);
+	playTot(function);
 
 	if (_vm->_inter->_terminate != 2)
 		_vm->_inter->_terminate = 0;

Modified: scummvm/trunk/engines/gob/game.h
===================================================================
--- scummvm/trunk/engines/gob/game.h	2011-01-29 22:44:06 UTC (rev 55627)
+++ scummvm/trunk/engines/gob/game.h	2011-01-29 22:44:36 UTC (rev 55628)
@@ -108,7 +108,7 @@
 
 	void prepareStart();
 
-	void playTot(int16 skipPlay);
+	void playTot(int16 function);
 
 	void capturePush(int16 left, int16 top, int16 width, int16 height);
 	void capturePop(char doDraw);
@@ -123,7 +123,7 @@
 	void start();
 
 	void totSub(int8 flags, const char *newTotFile);
-	void switchTotSub(int16 index, int16 skipPlay);
+	void switchTotSub(int16 index, int16 function);
 
 protected:
 	char _tempStr[256];

Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp	2011-01-29 22:44:06 UTC (rev 55627)
+++ scummvm/trunk/engines/gob/inter_v2.cpp	2011-01-29 22:44:36 UTC (rev 55628)
@@ -603,12 +603,12 @@
 
 void Inter_v2::o2_switchTotSub() {
 	int16 index;
-	int16 skipPlay;
+	int16 function;
 
 	index = _vm->_game->_script->readInt16();
-	skipPlay = _vm->_game->_script->readInt16();
+	function = _vm->_game->_script->readInt16();
 
-	_vm->_game->switchTotSub(index, skipPlay);
+	_vm->_game->switchTotSub(index, function);
 }
 
 void Inter_v2::o2_pushVars() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.