[Scummvm-cvs-logs] SF.net SVN: scummvm: [26964] scummvm/trunk/engines/agos/cursor.cpp

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Sun May 27 12:53:10 CEST 2007


Revision: 26964
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26964&view=rev
Author:   aquadran
Date:     2007-05-27 03:53:09 -0700 (Sun, 27 May 2007)

Log Message:
-----------
fixed warning and add assert for potential uninitialised src

Modified Paths:
--------------
    scummvm/trunk/engines/agos/cursor.cpp

Modified: scummvm/trunk/engines/agos/cursor.cpp
===================================================================
--- scummvm/trunk/engines/agos/cursor.cpp	2007-05-27 10:46:47 UTC (rev 26963)
+++ scummvm/trunk/engines/agos/cursor.cpp	2007-05-27 10:53:09 UTC (rev 26964)
@@ -664,7 +664,7 @@
 	} else if (getGameType() == GType_SIMON1) {
 		CursorMan.replaceCursor(_mouseData, 16, 16, 0, 0, 0xFF);
 	} else {
-		const uint16 *src;
+		const uint16 *src = NULL;
 		int i, j;
 
 		const uint8 color = (getGameType() == GType_ELVIRA1) ? 15: 65;
@@ -721,6 +721,8 @@
 		if (_dragFlag != 0)
 			src = _common_handInfo;
 
+		assert(src);
+
 		for (i = 0; i < 16; i++) {
 			for (j = 0; j < 16; j++) {
 				if (src[0] & (1 << (15 - (j % 16)))) {


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