From 92b8dbf1ada9a68a3e8b541ef66c4686b49e223b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 1 Jan 2014 16:08:21 +0100
Subject: TSAGE: R2R - Make the demo start

---
 engines/tsage/tsage.cpp | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp
index 80e2116c54..36708e373e 100644
--- a/engines/tsage/tsage.cpp
+++ b/engines/tsage/tsage.cpp
@@ -39,10 +39,12 @@ TSageEngine::TSageEngine(OSystem *system, const tSageGameDescription *gameDesc)
 	g_vm = this;
 	DebugMan.addDebugChannel(kRingDebugScripts, "scripts", "Scripts debugging");
 	_debugger = nullptr;
-	if (g_vm->getFeatures() & GF_DEMO)
-		_debugger = new DemoDebugger();
-	else if (g_vm->getGameID() == GType_Ringworld)
-		_debugger = new RingworldDebugger();
+	if (g_vm->getGameID() == GType_Ringworld) {
+		if (g_vm->getFeatures() & GF_DEMO)
+			_debugger = new DemoDebugger();
+		else
+			_debugger = new RingworldDebugger();
+	}
 	else if (g_vm->getGameID() == GType_BlueForce)
 		_debugger = new BlueForceDebugger();
 	else if (g_vm->getGameID() == GType_Ringworld2)
@@ -76,16 +78,16 @@ void TSageEngine::initialize() {
 
 	// Set up the resource manager
 	g_resourceManager = new ResourceManager();
-	if (g_vm->getFeatures() & GF_DEMO) {
-		// Add the single library file associated with the demo
-		g_resourceManager->addLib(getPrimaryFilename());
-		g_globals = new Globals();
-
-	} else if (g_vm->getGameID() == GType_Ringworld) {
-		g_resourceManager->addLib("RING.RLB");
-		g_resourceManager->addLib("TSAGE.RLB");
-		g_globals = new Globals();
-
+	if (g_vm->getGameID() == GType_Ringworld) {
+		if (g_vm->getFeatures() & GF_DEMO) {
+			// Add the single library file associated with the demo
+			g_resourceManager->addLib(getPrimaryFilename());
+			g_globals = new Globals();
+		} else {
+			g_resourceManager->addLib("RING.RLB");
+			g_resourceManager->addLib("TSAGE.RLB");
+			g_globals = new Globals();
+		}
 	} else if (g_vm->getGameID() == GType_BlueForce) {
 		g_resourceManager->addLib("BLUE.RLB");
 		if (g_vm->getFeatures() & GF_FLOPPY) {
-- 
cgit v1.2.3