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

Tramboi at users.sourceforge.net Tramboi at users.sourceforge.net
Sun Dec 23 16:23:06 CET 2007


Revision: 29962
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29962&view=rev
Author:   Tramboi
Date:     2007-12-23 07:23:01 -0800 (Sun, 23 Dec 2007)

Log Message:
-----------
Slight perturbation of the code gen for the sake of NDS Gobliiins

Modified Paths:
--------------
    scummvm/trunk/engines/gob/game_v1.cpp

Modified: scummvm/trunk/engines/gob/game_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v1.cpp	2007-12-23 14:43:15 UTC (rev 29961)
+++ scummvm/trunk/engines/gob/game_v1.cpp	2007-12-23 15:23:01 UTC (rev 29962)
@@ -48,31 +48,25 @@
 }
 
 void Game_v1::playTot(int16 skipPlay) {
-	char savedTotName[20];
-	int16 *oldCaptureCounter;
-	int16 *oldBreakFrom;
-	int16 *oldNestLevel;
 	int16 _captureCounter;
 	int16 breakFrom;
 	int16 nestLevel;
 	int32 variablesCount;
 	byte *filePtr;
-	byte *savedIP;
 
-	if (skipPlay < 0)
-		skipPlay = 0;
+	int16* oldNestLevel = _vm->_inter->_nestLevel;
+	int16* oldBreakFrom = _vm->_inter->_breakFromLevel;
+	int16* oldCaptureCounter = _vm->_scenery->_pCaptureCounter;
+	byte* savedIP = _vm->_global->_inter_execPtr;
 
-	oldNestLevel = _vm->_inter->_nestLevel;
-	oldBreakFrom = _vm->_inter->_breakFromLevel;
-	oldCaptureCounter = _vm->_scenery->_pCaptureCounter;
-	savedIP = _vm->_global->_inter_execPtr;
-
 	_vm->_inter->_nestLevel = &nestLevel;
 	_vm->_inter->_breakFromLevel = &breakFrom;
 	_vm->_scenery->_pCaptureCounter = &_captureCounter;
+
+	char savedTotName[20];
 	strcpy(savedTotName, _curTotFile);
 
-	if (skipPlay == 0) {
+	if (skipPlay <= 0) {
 		while (!_vm->_quitRequested) {
 			for (int i = 0; i < 4; i++) {
 				_vm->_draw->_fontToSprite[i].sprite = -1;
@@ -130,7 +124,7 @@
 			debugC(4, kDebugFileIO, "IMA: %s", _curImaFile);
 			debugC(4, kDebugFileIO, "EXT: %s", _curExtFile);
 
-			filePtr = _totFileData + 0x30;
+			byte* filePtr = _totFileData + 0x30;
 
 			_totTextData = 0;
 			if (READ_LE_UINT32(filePtr) != (uint32) -1) {


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




More information about the Scummvm-git-logs mailing list