diff options
| author | D G Turner | 2012-10-12 17:03:32 +0100 |
|---|---|---|
| committer | D G Turner | 2012-10-12 17:03:32 +0100 |
| commit | 151b7beb47ec4b964862d6779bd48e3a33482bbd (patch) | |
| tree | 867717c5266d0908d95edd82560599be20a4ede9 /engines/tsage/tsage.cpp | |
| parent | 80af0e239473f85c49cc2da3c848dfcde41d4a37 (diff) | |
| parent | 2b55837650c4229dc3d75b660cecfc7a3292e5e0 (diff) | |
| download | scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.gz scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.bz2 scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.zip | |
Merge branch 'master' into teenagentRefactor
Conflicts:
engines/teenagent/callbacks.cpp
Diffstat (limited to 'engines/tsage/tsage.cpp')
| -rw-r--r-- | engines/tsage/tsage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp index 40f4dfcfd2..87697f950b 100644 --- a/engines/tsage/tsage.cpp +++ b/engines/tsage/tsage.cpp @@ -45,7 +45,7 @@ TSageEngine::TSageEngine(OSystem *system, const tSageGameDescription *gameDesc) else if (g_vm->getGameID() == GType_BlueForce) _debugger = new BlueForceDebugger(); else if (g_vm->getGameID() == GType_Ringworld2) - _debugger = new Ringworld2Debugger(); + _debugger = new Ringworld2Debugger(); } Common::Error TSageEngine::init() { @@ -92,7 +92,7 @@ void TSageEngine::initialize() { g_resourceManager->addLib("TSAGE.RLB"); } g_globals = new BlueForce::BlueForceGlobals(); - + // Setup the user interface T2_GLOBALS._uiElements.setup(Common::Point(0, UI_INTERFACE_Y - 2)); @@ -107,7 +107,7 @@ void TSageEngine::initialize() { // Reset all global variables R2_GLOBALS.reset(); - } + } g_globals->gfxManager().setDefaults(); |