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

[lordhoto at users.sourceforge.net]

Revision: 31591
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31591&view=rev
Author:   lordhoto
Date:     2008-04-20 03:39:39 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
- Fixed some valgrind warnings.
- Little bugfix for scene shape loading.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v3.cpp
    scummvm/trunk/engines/kyra/scene_v3.cpp
    scummvm/trunk/engines/kyra/text_v3.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-20 07:44:27 UTC (rev 31590)
+++ scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-20 10:39:39 UTC (rev 31591)
@@ -131,7 +131,7 @@
 	delete [] _sceneAnims;
 
 	for (uint i = 0; i < ARRAYSIZE(_sceneShapes); ++i)
-		delete _sceneShapes[i];
+		delete [] _sceneShapes[i];
 
 	for (uint i = 0; i < ARRAYSIZE(_sceneAnimMovie); ++i)
 		delete _sceneAnimMovie[i];

Modified: scummvm/trunk/engines/kyra/scene_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_v3.cpp	2008-04-20 07:44:27 UTC (rev 31590)
+++ scummvm/trunk/engines/kyra/scene_v3.cpp	2008-04-20 10:39:39 UTC (rev 31591)
@@ -410,6 +410,7 @@
 			int16 y = stream->readSint16LE();
 			int16 w = stream->readSint16LE();
 			int16 h = stream->readSint16LE();
+			stream->seek(4, SEEK_CUR);
 			_sceneShapes[i] = _screen->encodeShape(x, y, w, h, 0);
 			assert(_sceneShapes[i]);
 			musicUpdate(0);

Modified: scummvm/trunk/engines/kyra/text_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_v3.cpp	2008-04-20 07:44:27 UTC (rev 31590)
+++ scummvm/trunk/engines/kyra/text_v3.cpp	2008-04-20 10:39:39 UTC (rev 31591)
@@ -35,7 +35,8 @@
 
 char *TextDisplayer_v3::preprocessString(const char *str) {
 	debugC(9, kDebugLevelMain, "TextDisplayer_v3::preprocessString('%s')", str);
-	strcpy(_talkBuffer, str);
+	if (_talkBuffer != str)
+		strcpy(_talkBuffer, str);
 
 	char *p = _talkBuffer;
 	while (*p) {


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