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

[drmccoy at users.sourceforge.net]

Revision: 53492
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53492&view=rev
Author:   drmccoy
Date:     2010-10-15 13:55:46 +0000 (Fri, 15 Oct 2010)

Log Message:
-----------
GOB: Properly fixing the captureCounter code analysis warning

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

Modified: scummvm/trunk/engines/gob/game.cpp
===================================================================
--- scummvm/trunk/engines/gob/game.cpp	2010-10-15 13:55:18 UTC (rev 53491)
+++ scummvm/trunk/engines/gob/game.cpp	2010-10-15 13:55:46 UTC (rev 53492)
@@ -247,7 +247,7 @@
 	int16 *oldCaptureCounter;
 	int16 *oldBreakFrom;
 	int16 *oldNestLevel;
-	int16 _captureCounter;
+	int16 captureCounter = 0;
 	int16 breakFrom;
 	int16 nestLevel;
 
@@ -259,7 +259,7 @@
 
 	_vm->_inter->_nestLevel = &nestLevel;
 	_vm->_inter->_breakFromLevel = &breakFrom;
-	_vm->_scenery->_pCaptureCounter = &_captureCounter;
+	_vm->_scenery->_pCaptureCounter = &captureCounter;
 	strcpy(savedTotName, _curTotFile);
 
 	if (skipPlay <= 0) {
@@ -337,9 +337,8 @@
 
 			_resources->unload();
 
-			if (_vm->_scenery->_pCaptureCounter)
-				for (int i = 0; i < *_vm->_scenery->_pCaptureCounter; i++)
-					capturePop(0);
+			for (int i = 0; i < *_vm->_scenery->_pCaptureCounter; i++)
+				capturePop(0);
 
 			if (skipPlay != -1) {
 				_vm->_goblin->freeObjects();


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