[Scummvm-cvs-logs] SF.net SVN: scummvm: [31495] scummvm/trunk/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun Apr 13 01:59:12 CEST 2008


Revision: 31495
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31495&view=rev
Author:   lordhoto
Date:     2008-04-12 16:59:11 -0700 (Sat, 12 Apr 2008)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.cpp
    scummvm/trunk/engines/kyra/sequences_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-04-12 23:55:26 UTC (rev 31494)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-04-12 23:59:11 UTC (rev 31495)
@@ -148,6 +148,7 @@
 	memset(_cauldronStateTables, 0, sizeof(_cauldronStateTables));
 
 	_menuDirectlyToLoad = false;
+	_menu = 0;
 }
 
 KyraEngine_v2::~KyraEngine_v2() {

Modified: scummvm/trunk/engines/kyra/sequences_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-04-12 23:55:26 UTC (rev 31494)
+++ scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-04-12 23:59:11 UTC (rev 31495)
@@ -2633,7 +2633,6 @@
 			numShp++;
 			_defaultShapeTable[numShp] = _screen->getPtrToShape(_newShapeFiledata, numShp);
 		} while (_defaultShapeTable[numShp]);
-		_menu = 0;
 	} else {	
 		MainMenu::StaticData data = {
 			{ _sequenceStrings[97], _sequenceStrings[96], _sequenceStrings[95], _sequenceStrings[98] },
@@ -2667,10 +2666,8 @@
 
 	memset(&_defaultShapeTable, 0, sizeof(_defaultShapeTable));
 
-	if (_menu) {
-		delete _menu;
-		_menu = 0;
-	}
+	delete _menu;
+	_menu = 0;
 }
 
 #pragma mark -


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