From 9b5cf8f1bafd5aa0dba9194a8f04e58724652891 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Sun, 29 Jul 2012 02:30:26 +0200
Subject: WINTERMUTE: Introduce a Singleton-class for holding
 registry/filemanager.

---
 engines/wintermute/base/particles/part_emitter.cpp  | 4 ++--
 engines/wintermute/base/particles/part_particle.cpp | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'engines/wintermute/base/particles')

diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index 7389885f5a..ced01b7fd9 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -128,12 +128,12 @@ bool PartEmitter::addSprite(const char *filename) {
 	}
 
 	// check if file exists
-	Common::SeekableReadStream *File = _gameRef->_fileManager->openFile(filename);
+	Common::SeekableReadStream *File = BaseFileManager::getEngineInstance()->openFile(filename);
 	if (!File) {
 		_gameRef->LOG(0, "Sprite '%s' not found", filename);
 		return STATUS_FAILED;
 	} else {
-		_gameRef->_fileManager->closeFile(File);
+		BaseFileManager::getEngineInstance()->closeFile(File);
 	}
 
 	char *str = new char[strlen(filename) + 1];
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp
index 2b05edd61f..1a449a50a5 100644
--- a/engines/wintermute/base/particles/part_particle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -29,7 +29,6 @@
 #include "engines/wintermute/base/particles/part_particle.h"
 #include "engines/wintermute/base/particles/part_emitter.h"
 #include "engines/wintermute/base/base_sprite.h"
-#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
@@ -80,7 +79,7 @@ bool PartParticle::setSprite(const Common::String &filename) {
 	_sprite = NULL;
 
 	SystemClassRegistry::getInstance()->_disabled = true;
-	_sprite = new BaseSprite(_gameRef, _gameRef);
+	_sprite = new BaseSprite(_gameRef, (BaseObject*)_gameRef);
 	if (_sprite && DID_SUCCEED(_sprite->loadFile(filename))) {
 		SystemClassRegistry::getInstance()->_disabled = false;
 		return STATUS_OK;
-- 
cgit v1.2.3