aboutsummaryrefslogtreecommitdiff
path: root/base/main.cpp
diff options
context:
space:
mode:
authorMax Horn2003-10-05 13:10:28 +0000
committerMax Horn2003-10-05 13:10:28 +0000
commite1128abe6472f4087e6c9585e5c1e8c97e81ff0d (patch)
tree12421a698d059be6383835d86db9d44b95647d58 /base/main.cpp
parentb37853b713ad68bcbfbc3257e38b54443acabcc6 (diff)
downloadscummvm-rg350-e1128abe6472f4087e6c9585e5c1e8c97e81ff0d.tar.gz
scummvm-rg350-e1128abe6472f4087e6c9585e5c1e8c97e81ff0d.tar.bz2
scummvm-rg350-e1128abe6472f4087e6c9585e5c1e8c97e81ff0d.zip
create the timer object a bit earlier
svn-id: r10603
Diffstat (limited to 'base/main.cpp')
-rw-r--r--base/main.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/base/main.cpp b/base/main.cpp
index b47b9e4b17..94e565ed5f 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -278,6 +278,9 @@ int main(int argc, char *argv[]) {
// Create the system object
OSystem *system = detector.createSystem();
g_system = system;
+
+ // Create the timer services
+ g_timer = new Timer(system);
// Set initial window caption
prop.caption = "ScummVM";
@@ -290,8 +293,9 @@ int main(int argc, char *argv[]) {
if (detector._gameFileName.isEmpty())
launcherDialog(detector, system);
- // Verify the given game name
+ // Verify the given game name is a valid supported game
if (detector.detectMain()) {
+
// Set the window caption to the game name
prop.caption = g_config->get("description", detector._gameFileName);
if (prop.caption == NULL)
@@ -304,9 +308,6 @@ int main(int argc, char *argv[]) {
prop.gfx_mode = GFX_NORMAL;
system->property(OSystem::PROP_SET_GFX_MODE, &prop);
}
-
- // Create the timer services
- g_timer = new Timer(system);
// Create the game engine
Engine *engine = detector.createEngine(system);