[Scummvm-cvs-logs] CVS: scummvm/base main.cpp,1.23,1.24

Max Horn fingolfin at users.sourceforge.net
Fri Nov 7 06:19:26 CET 2003


Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv2918

Modified Files:
	main.cpp 
Log Message:
err, *strnlen(,,3)* used to check for empty strings? I think not :-)

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- main.cpp	7 Nov 2003 14:00:33 -0000	1.23
+++ main.cpp	7 Nov 2003 14:17:34 -0000	1.24
@@ -258,17 +258,15 @@
 	if (detector.detectMain()) {
 
 		// Set the window caption to the game name
-		prop.caption = ConfMan.get("description", detector._targetName).c_str();
-		if (strnlen(prop.caption, 3) == 0)	
-			prop.caption = detector._game.description;
-		if (strnlen(prop.caption, 3) == 0)	
-			prop.caption = detector._targetName.c_str();
-		if (strnlen(prop.caption, 3) != 0)	
+		Common::String caption(ConfMan.get("description", detector._targetName));
+		if (caption.isEmpty() && detector._game.description)
+			caption = detector._game.description;
+		if (caption.isEmpty())	
+			caption = detector._targetName;
+		if (!caption.isEmpty())	{
+			prop.caption = caption.c_str();
 			system->property(OSystem::PROP_SET_WINDOW_CAPTION, &prop);
-
-		// FIXME: It seem not logical that we first might set the gfx mode to
-		// 1x, and then immediately after might override it again. We probably
-		// should combine both checks into one.
+		}
 
 		// See if the game should default to 1x scaler
 		if (!ConfMan.hasKey("gfx_mode", detector._targetName) && 





More information about the Scummvm-git-logs mailing list