WINTERMUTE: Introduce a Singleton-class for holding registry/filemanager.

16 files changed, 37 insertions, 37 deletions

diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index caadab18aa..b4e9d80a02 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -119,7 +119,7 @@ AdActor::~AdActor() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdActor::loadFile(const char *filename) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdActor::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -221,7 +221,7 @@ bool AdActor::loadBuffer(byte *buffer, bool complete) {
 

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (complete) {

 		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ACTOR) {

@@ -1410,7 +1410,7 @@ bool AdActor::mergeAnims(const char *animsFilename) {
 	TOKEN_TABLE_END

 

 

-	byte *fileBuffer = _gameRef->_fileManager->readWholeFile(animsFilename);

+	byte *fileBuffer = BaseFileManager::getEngineInstance()->readWholeFile(animsFilename);

 	if (fileBuffer == NULL) {

 		_gameRef->LOG(0, "AdActor::MergeAnims failed for file '%s'", animsFilename);

 		return STATUS_FAILED;

@@ -1419,7 +1419,7 @@ bool AdActor::mergeAnims(const char *animsFilename) {
 	byte *buffer = fileBuffer;

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	bool ret = STATUS_OK;

 

diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index 4d1641036a..e6fde43697 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -84,7 +84,7 @@ AdEntity::~AdEntity() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdEntity::loadFile(const char *filename) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdEntity::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -198,7 +198,7 @@ bool AdEntity::loadBuffer(byte *buffer, bool complete) {
 

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (complete) {

 		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ENTITY) {

diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 260a3fc378..e399ba5fcf 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -1241,7 +1241,7 @@ bool AdGame::showCursor() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdGame::loadFile(const char *filename) {

-	byte *buffer = _fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdGame::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -1294,7 +1294,7 @@ bool AdGame::loadBuffer(byte *buffer, bool complete) {
 	byte *params;

 	byte *params2;

 	int cmd = 1;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	bool itemFound = false, itemsFound = false;

 

@@ -1537,7 +1537,7 @@ bool AdGame::getVersion(byte *verMajor, byte *verMinor, byte *extMajor, byte *ex
 

 //////////////////////////////////////////////////////////////////////////

 bool AdGame::loadItemsFile(const char *filename, bool merge) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdGame::LoadItemsFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -1567,7 +1567,7 @@ bool AdGame::loadItemsBuffer(byte *buffer, bool merge) {
 

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (!merge) {

 		while (_items.getSize() > 0) {

@@ -1650,7 +1650,7 @@ bool AdGame::windowLoadHook(UIWindow *win, char **buffer, char **params) {
 	TOKEN_TABLE_END

 

 	int cmd = PARSERR_GENERIC;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	cmd = parser.getCommand(buffer, commands, params);

 	switch (cmd) {

@@ -2130,12 +2130,12 @@ char *AdGame::findSpeechFile(char *stringID) {
 

 	for (int i = 0; i < _speechDirs.getSize(); i++) {

 		sprintf(ret, "%s%s.ogg", _speechDirs[i], stringID);

-		if (_fileManager->hasFile(ret)) {

+		if (BaseFileManager::getEngineInstance()->hasFile(ret)) {

 			return ret;

 		}

 

 		sprintf(ret, "%s%s.wav", _speechDirs[i], stringID);

-		if (_fileManager->hasFile(ret)) {

+		if (BaseFileManager::getEngineInstance()->hasFile(ret)) {

 			return ret;

 		}

 	}

diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index bc773cbdaf..555fa8e5c2 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -164,7 +164,7 @@ bool AdInventoryBox::display() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdInventoryBox::loadFile(const char *filename) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdInventoryBox::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -222,7 +222,7 @@ bool AdInventoryBox::loadBuffer(byte *buffer, bool complete) {
 

 	byte *params;

 	int cmd = 2;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 	bool alwaysVisible = false;

 

 	_exclusive = false;

diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp
index 8e93ef77d4..cacafa826b 100644
--- a/engines/wintermute/ad/ad_item.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -84,7 +84,7 @@ AdItem::~AdItem() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdItem::loadFile(const char *filename) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdItem::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -166,7 +166,7 @@ bool AdItem::loadBuffer(byte *buffer, bool complete) {
 

 	byte *params;

 	int cmd = 2;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (complete) {

 		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ITEM) {

diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp
index c4be6c8dfc..5742c9fc85 100644
--- a/engines/wintermute/ad/ad_layer.cpp
+++ b/engines/wintermute/ad/ad_layer.cpp
@@ -62,7 +62,7 @@ AdLayer::~AdLayer() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdLayer::loadFile(const char *filename) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdLayer::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -121,7 +121,7 @@ bool AdLayer::loadBuffer(byte *buffer, bool complete) {
 

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (complete) {

 		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_LAYER) {

diff --git a/engines/wintermute/ad/ad_region.cpp b/engines/wintermute/ad/ad_region.cpp
index 7d51cfce37..5ecb24c5b7 100644
--- a/engines/wintermute/ad/ad_region.cpp
+++ b/engines/wintermute/ad/ad_region.cpp
@@ -54,7 +54,7 @@ AdRegion::~AdRegion() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdRegion::loadFile(const char *filename) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdRegion::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -118,7 +118,7 @@ bool AdRegion::loadBuffer(byte *buffer, bool complete) {
 

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (complete) {

 		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_REGION) {

diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index 7f2fdc9b3e..e321f1cd93 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -204,7 +204,7 @@ bool AdResponseBox::createButtons() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdResponseBox::loadFile(const char *filename) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdResponseBox::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -259,7 +259,7 @@ bool AdResponseBox::loadBuffer(byte *buffer, bool complete) {
 

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (complete) {

 		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_RESPONSE_BOX) {

diff --git a/engines/wintermute/ad/ad_rot_level.cpp b/engines/wintermute/ad/ad_rot_level.cpp
index 753dd38190..28c37b5b81 100644
--- a/engines/wintermute/ad/ad_rot_level.cpp
+++ b/engines/wintermute/ad/ad_rot_level.cpp
@@ -53,7 +53,7 @@ AdRotLevel::~AdRotLevel() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdRotLevel::loadFile(const char *filename) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdRotLevel::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -93,7 +93,7 @@ bool AdRotLevel::loadBuffer(byte *buffer, bool complete) {
 

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (complete) {

 		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ROTATION_LEVEL) {

diff --git a/engines/wintermute/ad/ad_scale_level.cpp b/engines/wintermute/ad/ad_scale_level.cpp
index 465e82cbde..430be3559d 100644
--- a/engines/wintermute/ad/ad_scale_level.cpp
+++ b/engines/wintermute/ad/ad_scale_level.cpp
@@ -51,7 +51,7 @@ AdScaleLevel::~AdScaleLevel() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdScaleLevel::loadFile(const char *filename) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdScaleLevel::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -91,7 +91,7 @@ bool AdScaleLevel::loadBuffer(byte *buffer, bool complete) {
 

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (complete) {

 		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_SCALE_LEVEL) {

diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 9a808bbb5f..b84c4c2dca 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -540,7 +540,7 @@ bool AdScene::initLoop() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdScene::loadFile(const char *filename) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdScene::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -647,7 +647,7 @@ bool AdScene::loadBuffer(byte *buffer, bool complete) {
 

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (complete) {

 		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_SCENE) {

diff --git a/engines/wintermute/ad/ad_sentence.cpp b/engines/wintermute/ad/ad_sentence.cpp
index 5126a51c80..d243aaf8e6 100644
--- a/engines/wintermute/ad/ad_sentence.cpp
+++ b/engines/wintermute/ad/ad_sentence.cpp
@@ -287,7 +287,7 @@ bool AdSentence::setupTalkFile(const char *soundFilename) {
 

 	AnsiString talkDefFileName = PathUtil::combine(path, name + ".talk");

 

-	if (!_gameRef->_fileManager->hasFile(talkDefFileName)) {

+	if (!BaseFileManager::getEngineInstance()->hasFile(talkDefFileName)) {

 		return STATUS_OK;    // no talk def file found

 	}

 

diff --git a/engines/wintermute/ad/ad_sprite_set.cpp b/engines/wintermute/ad/ad_sprite_set.cpp
index 0a5949b2c0..df10418d95 100644
--- a/engines/wintermute/ad/ad_sprite_set.cpp
+++ b/engines/wintermute/ad/ad_sprite_set.cpp
@@ -60,7 +60,7 @@ AdSpriteSet::~AdSpriteSet() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdSpriteSet::loadFile(const char *filename, int lifeTime, TSpriteCacheType cacheType) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdSpriteSet::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -111,7 +111,7 @@ bool AdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC
 

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (complete) {

 		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_SPRITESET) {

diff --git a/engines/wintermute/ad/ad_talk_def.cpp b/engines/wintermute/ad/ad_talk_def.cpp
index b12a6af357..71d8d6b1c3 100644
--- a/engines/wintermute/ad/ad_talk_def.cpp
+++ b/engines/wintermute/ad/ad_talk_def.cpp
@@ -71,7 +71,7 @@ AdTalkDef::~AdTalkDef() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdTalkDef::loadFile(const char *filename) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdTalkDef::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -114,7 +114,7 @@ bool AdTalkDef::loadBuffer(byte *buffer, bool complete) {
 

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (complete) {

 		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_TALK) {

diff --git a/engines/wintermute/ad/ad_talk_node.cpp b/engines/wintermute/ad/ad_talk_node.cpp
index ecaf098a40..14c1c3f459 100644
--- a/engines/wintermute/ad/ad_talk_node.cpp
+++ b/engines/wintermute/ad/ad_talk_node.cpp
@@ -94,7 +94,7 @@ bool AdTalkNode::loadBuffer(byte *buffer, bool complete) {
 

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (complete) {

 		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ACTION) {

diff --git a/engines/wintermute/ad/ad_waypoint_group.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp
index 1188ec2fb1..0f83c2c50b 100644
--- a/engines/wintermute/ad/ad_waypoint_group.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group.cpp
@@ -66,7 +66,7 @@ void AdWaypointGroup::cleanup() {
 

 //////////////////////////////////////////////////////////////////////////

 bool AdWaypointGroup::loadFile(const char *filename) {

-	byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

+	byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);

 	if (buffer == NULL) {

 		_gameRef->LOG(0, "AdWaypointGroup::LoadFile failed for file '%s'", filename);

 		return STATUS_FAILED;

@@ -112,7 +112,7 @@ bool AdWaypointGroup::loadBuffer(byte *buffer, bool complete) {
 

 	byte *params;

 	int cmd;

-	BaseParser parser(_gameRef);

+	BaseParser parser;

 

 	if (complete) {

 		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_WAYPOINTS) {