[Scummvm-cvs-logs] SF.net SVN: scummvm:[33766] scummvm/trunk/engines/drascula/drascula.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 33766
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33766&view=rev
Author:   eriktorbjorn
Date:     2008-08-10 18:44:00 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
Fixed a bunch of Valgrind warnings (mostly uninitialised variables, but also an
invalid free()), so that I can start and quit the game without any unexpected
warnings. (The obvious next step, of course, would be to actually *play* the game
for a bit...)

Modified Paths:
--------------
    scummvm/trunk/engines/drascula/drascula.cpp

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2008-08-10 18:35:27 UTC (rev 33765)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2008-08-10 18:44:00 UTC (rev 33766)
@@ -162,6 +162,12 @@
 	_textmisc = 0;
 	_textd1 = 0;
 
+	_color = 0;
+	blinking = 0;
+	leftMouseButton = 0;
+	rightMouseButton = 0;
+	*textName = 0;
+
 	if (!loadDrasculaDat())
 		return 1;
 
@@ -1020,7 +1026,7 @@
 
 	for (int lang = 0; lang < _numLangs; lang++) {
 		if (ptr[lang]) {
-			free(ptr[lang][0] - DATAALIGNMENT);
+			free(ptr[lang][0]);
 			free(ptr[lang]);
 		}
 	}


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