[Scummvm-cvs-logs] CVS: scummvm/gui ThemeNew.cpp,1.3,1.4

Eugene Sandulenko sev at users.sourceforge.net
Fri Jan 27 11:02:03 CET 2006


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21298

Modified Files:
	ThemeNew.cpp 
Log Message:
Fix crash on platforms which do not initialize memory with zeroes.


Index: ThemeNew.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ThemeNew.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ThemeNew.cpp	27 Jan 2006 16:46:56 -0000	1.3
+++ ThemeNew.cpp	27 Jan 2006 19:01:02 -0000	1.4
@@ -109,6 +109,7 @@
 	}
 	
 	static Common::String imageHandlesTable[kImageHandlesMax];
+
 	_configFile.getKey("dialog_corner", "pixmaps", imageHandlesTable[kDialogBkgdCorner]);
 	_configFile.getKey("dialog_top", "pixmaps", imageHandlesTable[kDialogBkgdTop]);
 	_configFile.getKey("dialog_left", "pixmaps", imageHandlesTable[kDialogBkgdLeft]);
@@ -168,7 +169,7 @@
 	_images = new const Graphics::Surface*[ARRAYSIZE(imageHandlesTable)];
 	assert(_images);
 
-	for (int i = 0; _imageHandles[i] != "\0"; ++i) {
+	for (int i = 0; i < kImageHandlesMax; ++i) {
 		ImageMan.registerSurface(_imageHandles[i], 0);
 		_images[i] = ImageMan.getSurface(_imageHandles[i]);
 	}





More information about the Scummvm-git-logs mailing list