[Scummvm-cvs-logs] CVS: scummvm/common main.cpp,1.15,1.16

Max Horn fingolfin at users.sourceforge.net
Thu Nov 14 06:21:08 CET 2002


Update of /cvsroot/scummvm/scummvm/common
In directory usw-pr-cvs1:/tmp/cvs-serv2418/common

Modified Files:
	main.cpp 
Log Message:
set default window title 'ScummVM' while launcher is up

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/main.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- main.cpp	23 Oct 2002 12:56:30 -0000	1.15
+++ main.cpp	14 Nov 2002 14:20:41 -0000	1.16
@@ -143,6 +143,7 @@
 int main(int argc, char *argv[])
 {
 	GameDetector detector;
+	OSystem::Property prop;
 
 #if defined(UNIX)
 	/* On Unix, do a quick endian / alignement check before starting */
@@ -175,8 +176,12 @@
 	// Create the system object
 	OSystem *system = detector.createSystem();
 
+	// Set initial window caption
+	prop.caption = "ScummVM";
+	system->property(OSystem::PROP_SET_WINDOW_CAPTION, &prop);
+
+
 	// Create the GUI manager
-	// TODO - move this up for the launcher dialog?
 	g_gui = new NewGui(system);
 
 	// Unless a game was specified, show the launcher dialog
@@ -189,8 +194,7 @@
 		return (-1);
 	}
 	
-	// Set the window caption (for OSystems that support it)
-	OSystem::Property prop;
+	// Set the window caption to the game name
 	prop.caption = detector.getGameName().c_str();
 	system->property(OSystem::PROP_SET_WINDOW_CAPTION, &prop);
 





More information about the Scummvm-git-logs mailing list