thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compile.

Browse source 
svn-id: r9784
This commit is contained in:
Torbjörn Andersson 2003-08-19 16:10:05 +00:00
parent a6d7d1521e
commit f5cdcfa3db
1 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

57
common/main.cpp
View file

@ -200,39 +200,38 @@ int main(int argc, char *argv[]) {
launcherDialog(detector, system);
// Verify the given game name
if (detector.detectMain())
goto exitNow;
if (!detector.detectMain()) {
// Set the window caption to the game name
prop.caption = g_config->get("description", detector._gameFileName);
if (prop.caption == NULL)
prop.caption = detector.getGameName().c_str();
system->property(OSystem::PROP_SET_WINDOW_CAPTION, &prop);
// Set the window caption to the game name
prop.caption = g_config->get("description", detector._gameFileName);
if (prop.caption == NULL)
prop.caption = detector.getGameName().c_str();
system->property(OSystem::PROP_SET_WINDOW_CAPTION, &prop);
// See if the game should default to 1x scaler
if ((detector._default_gfx_mode) &&
(detector._game.features & GF_DEFAULT_TO_1X_SCALER)) {
prop.gfx_mode = GFX_NORMAL;
system->property(OSystem::PROP_SET_GFX_MODE, &prop);
}
// See if the game should default to 1x scaler
if ((detector._default_gfx_mode) &&
(detector._game.features & GF_DEFAULT_TO_1X_SCALER)) {
prop.gfx_mode = GFX_NORMAL;
system->property(OSystem::PROP_SET_GFX_MODE, &prop);
// Create the game engine
Engine *engine = Engine::createFromDetector(&detector, system);
// print a message if gameid is invalid
if (engine == NULL)
error("%s is an invalid target. Use the -z parameter to list targets\n",
detector._gameFileName.c_str());
// Run the game engine
engine->go();
// Stop all sound processing now (this prevents some race conditions later on)
system->clear_sound_proc();
// Free up memory
delete engine;
}
// Create the game engine
Engine *engine = Engine::createFromDetector(&detector, system);
// print a message if gameid is invalid
if (engine == NULL)
error("%s is an invalid target. Use the -z parameter to list targets\n",
detector._gameFileName.c_str());
// Run the game engine
engine->go();
// Stop all sound processing now (this prevents some race conditions later on)
system->clear_sound_proc();
// Free up memory
delete engine;
exitNow:
delete g_gui;
delete g_config;