Merge remote branch 'upstream/master' into t7g-ios

Conflicts:
	audio/decoders/qdm2.h
	common/util.cpp
	engines/groovie/music.cpp
	engines/groovie/resource.h
	video/qt_decoder.cpp
	video/qt_decoder.h

1 files changed, 15 insertions, 15 deletions

diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp
index 1f6442f2ff..8813fc7e45 100644
--- a/engines/tsage/tsage.cpp
+++ b/engines/tsage/tsage.cpp
@@ -23,11 +23,7 @@
  *
  */
 
-#include "common/config-manager.h"
-#include "common/debug.h"
 #include "common/debug-channels.h"
-#include "common/system.h"
-#include "common/savefile.h"
 #include "engines/util.h"
 
 #include "tsage/tsage.h"
@@ -46,7 +42,6 @@ TSageEngine::TSageEngine(OSystem *system, const tSageGameDescription *gameDesc)
 	_vm = this;
 	DebugMan.addDebugChannel(kRingDebugScripts, "scripts", "Scripts debugging");
 	_debugger = new Debugger();
-	_dataManager = NULL;
 }
 
 Common::Error TSageEngine::init() {
@@ -69,29 +64,34 @@ bool TSageEngine::hasFeature(EngineFeature f) const {
 }
 
 void TSageEngine::initialise() {
-	_tSageManager = new RlbManager(_memoryManager, "tsage.rlb");
-	_dataManager = new RlbManager(_memoryManager, "ring.rlb");
-
 	_saver = new Saver();
+
+	// Set up the resource manager
+	_resourceManager = new ResourceManager();
+	if (_vm->getFeatures() & GF_DEMO) {
+		// Add the single library file associated with the demo
+		_resourceManager->addLib(getPrimaryFilename());
+	} else {
+		_resourceManager->addLib("RING.RLB");
+		_resourceManager->addLib("TSAGE.RLB");
+	}
+
 	_globals = new Globals();
 	_globals->gfxManager().setDefaults();
 }
 
 void TSageEngine::deinitialise() {
 	delete _globals;
+	delete _resourceManager;
 	delete _saver;
-	delete _tSageManager;
-	delete _dataManager;
 }
 
 Common::Error TSageEngine::run() {
 	// Basic initialisation
 	initialise();
 
-	_globals->_events.showCursor();
-
 	_globals->_sceneHandler.registerHandler();
-	_globals->_game.execute();
+	_globals->_game->execute();
 
 	deinitialise();
 	return Common::kNoError;
@@ -101,14 +101,14 @@ Common::Error TSageEngine::run() {
  * Returns true if it is currently okay to restore a game
  */
 bool TSageEngine::canLoadGameStateCurrently() {
-	return _globals->getFlag(50) == 0;
+	return (_globals->getFlag(50) == 0);
 }
 
 /**
  * Returns true if it is currently okay to save the game
  */
 bool TSageEngine::canSaveGameStateCurrently() {
-	return _globals->getFlag(50) == 0;
+	return (_globals->getFlag(50) == 0);
 }
 
 /**