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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Wed Apr 23 20:18:12 CEST 2008


Revision: 31669
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31669&view=rev
Author:   lordhoto
Date:     2008-04-23 11:18:11 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
- cleanup
- some valgrind warning fixes

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v3.cpp
    scummvm/trunk/engines/kyra/kyra_v3.h
    scummvm/trunk/engines/kyra/screen.cpp
    scummvm/trunk/engines/kyra/text.cpp
    scummvm/trunk/engines/kyra/text_v3.cpp
    scummvm/trunk/engines/kyra/wsamovie.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-23 17:41:28 UTC (rev 31668)
+++ scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-23 18:18:11 UTC (rev 31669)
@@ -600,9 +600,10 @@
 
 	musicUpdate(0);
 	memset(_hiddenItems, -1, sizeof(_hiddenItems));
-	
-	//resetNewSceneDlgState();
 
+	memset(_newSceneDlgState, 0, sizeof(_newSceneDlgState));
+	memset(_conversationState, -1, sizeof(_conversationState));
+
 	_sceneList = new SceneDesc[98];
 	musicUpdate(0);
 	runStartupScript(1, 0);
@@ -728,6 +729,14 @@
 	assert(_gameShapes[realIndex]);
 }
 
+uint8 *KyraEngine_v3::getShapePtr(int shape) const {
+	debugC(9, kDebugLevelMain, "KyraEngine_v3::getShapePtr(%d)", shape);
+	ShapeMap::iterator iter = _gameShapes.find(shape);
+	if (iter == _gameShapes.end())
+		return 0;
+	return iter->_value;
+}
+
 void KyraEngine_v3::loadMalcolmShapes(int newShapes) {
 	debugC(9, kDebugLevelMain, "KyraEngine_v3::loadMalcolmShapes(%d)", newShapes);
 	static const uint8 numberOffset[] = { 3, 3, 4, 4, 3, 3 };

Modified: scummvm/trunk/engines/kyra/kyra_v3.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-23 17:41:28 UTC (rev 31668)
+++ scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-23 18:18:11 UTC (rev 31669)
@@ -296,7 +296,7 @@
 	ShapeMap _gameShapes;
 
 	void addShapeToPool(const uint8 *data, int realIndex, int shape);
-	uint8 *getShapePtr(int shape) const { return _gameShapes[shape]; }
+	uint8 *getShapePtr(int shape) const;
 
 	void initMouseShapes();
 

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2008-04-23 17:41:28 UTC (rev 31668)
+++ scummvm/trunk/engines/kyra/screen.cpp	2008-04-23 18:18:11 UTC (rev 31669)
@@ -1127,13 +1127,11 @@
 		_drawShapeVar5 = 256;
 	}
 
-	if (flags & 0x4000) {
+	if (flags & 0x4000)
 		_drawShapeVar5 = va_arg(args, int);
-	}
 
-	if (flags & 0x800) {
+	if (flags & 0x800)
 		_dsDrawLayer = va_arg(args, int);
-	}
 
 	if (flags & DSF_SCALE) {
 		_dsScaleW = va_arg(args, int);

Modified: scummvm/trunk/engines/kyra/text.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text.cpp	2008-04-23 17:41:28 UTC (rev 31668)
+++ scummvm/trunk/engines/kyra/text.cpp	2008-04-23 18:18:11 UTC (rev 31669)
@@ -151,9 +151,8 @@
 		} else {
 			_talkSubstrings[currentLine * TALK_SUBSTRING_LEN + pos] = *str;
 			++pos;
-			if (pos > TALK_SUBSTRING_LEN - 2) {
+			if (pos >= TALK_SUBSTRING_LEN - 2)
 				pos = TALK_SUBSTRING_LEN - 2;
-			}
 		}
 		++str;
 	}

Modified: scummvm/trunk/engines/kyra/text_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_v3.cpp	2008-04-23 17:41:28 UTC (rev 31668)
+++ scummvm/trunk/engines/kyra/text_v3.cpp	2008-04-23 18:18:11 UTC (rev 31669)
@@ -36,7 +36,7 @@
 char *TextDisplayer_v3::preprocessString(const char *str) {
 	debugC(9, kDebugLevelMain, "TextDisplayer_v3::preprocessString('%s')", str);
 	if (_talkBuffer != str)
-		strcpy(_talkBuffer, str);
+		strncpy(_talkBuffer, str, sizeof(_talkBuffer));
 
 	char *p = _talkBuffer;
 	while (*p) {

Modified: scummvm/trunk/engines/kyra/wsamovie.cpp
===================================================================
--- scummvm/trunk/engines/kyra/wsamovie.cpp	2008-04-23 17:41:28 UTC (rev 31668)
+++ scummvm/trunk/engines/kyra/wsamovie.cpp	2008-04-23 18:18:11 UTC (rev 31669)
@@ -237,7 +237,7 @@
 
 void WSAMovieAmiga::displayFrame(int frameNum, ...) {
 	debugC(9, kDebugLevelMovie, "WSAMovieAmiga::displayFrame(%d)", frameNum);
-	if (frameNum >= _numFrames || !_opened)
+	if (frameNum >= _numFrames || frameNum < 0 || !_opened)
 		return;
 
 	uint8 *dst;
@@ -430,7 +430,7 @@
 
 void WSAMovieV2::displayFrame(int frameNum, ...) {
 	debugC(9, kDebugLevelMovie, "WSAMovieV2::displayFrame(%d, ...)", frameNum);
-	if (frameNum >= _numFrames || !_opened)
+	if (frameNum >= _numFrames || frameNum < 0 || !_opened)
 		return;
 
 	uint8 *dst = 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