[Scummvm-cvs-logs] SF.net SVN: scummvm: [21258] scummvm/trunk/engines/lure

kirben at users.sourceforge.net kirben at users.sourceforge.net
Mon Mar 13 03:53:01 CET 2006


Revision: 21258
Author:   kirben
Date:     2006-03-13 03:52:16 -0800 (Mon, 13 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21258&view=rev

Log Message:
-----------
Fix a few valgrind warnings

Modified Paths:
--------------
    scummvm/trunk/engines/lure/game.cpp
    scummvm/trunk/engines/lure/menu.cpp
    scummvm/trunk/engines/lure/res.cpp
    scummvm/trunk/engines/lure/room.cpp
Modified: scummvm/trunk/engines/lure/game.cpp
===================================================================
--- scummvm/trunk/engines/lure/game.cpp	2006-03-13 11:40:40 UTC (rev 21257)
+++ scummvm/trunk/engines/lure/game.cpp	2006-03-13 11:52:16 UTC (rev 21258)
@@ -69,7 +69,7 @@
 			hotspot->tick();
 	}
 
-	delete idList;
+	delete[] idList;
 	Screen::getReference().update();
 }
 

Modified: scummvm/trunk/engines/lure/menu.cpp
===================================================================
--- scummvm/trunk/engines/lure/menu.cpp	2006-03-13 11:40:40 UTC (rev 21257)
+++ scummvm/trunk/engines/lure/menu.cpp	2006-03-13 11:52:16 UTC (rev 21258)
@@ -58,7 +58,7 @@
 }
 
 MenuRecord::~MenuRecord() {
-	delete _entries[0];	// Delete string data for all the menu items
+	free(_entries[0]);	// Delete string data for all the menu items
 	free(_entries);		// Free the list
 }
 

Modified: scummvm/trunk/engines/lure/res.cpp
===================================================================
--- scummvm/trunk/engines/lure/res.cpp	2006-03-13 11:40:40 UTC (rev 21257)
+++ scummvm/trunk/engines/lure/res.cpp	2006-03-13 11:52:16 UTC (rev 21258)
@@ -55,7 +55,7 @@
 	delete _paletteSubset;
 	delete _scriptData;
 	delete _script2Data;
-	delete _hotspotScriptData;
+	free(_hotspotScriptData);
 	delete _messagesData;
 	delete _cursors;
 }

Modified: scummvm/trunk/engines/lure/room.cpp
===================================================================
--- scummvm/trunk/engines/lure/room.cpp	2006-03-13 11:40:40 UTC (rev 21257)
+++ scummvm/trunk/engines/lure/room.cpp	2006-03-13 11:52:16 UTC (rev 21258)
@@ -76,6 +76,7 @@
 
 	_roomData = NULL;
 	_talkDialog = NULL;
+	_hotspotId = 0;
 	_hotspotName[0] = '\0';
 	for (int ctr = 0; ctr < MAX_NUM_LAYERS; ++ctr) _layers[ctr] = NULL;
 	_numLayers = 0;


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