libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-06 02:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VOYEUR: Remove setVm from FilesManager

Browse Source
This commit is contained in:
Strangerke 2014-02-27 08:09:57 +01:00
parent 9f74d13c57
commit 6dd0a81fdf
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/voyeur/files.cpp
View File

@ -172,8 +172,9 @@ void BoltFilesState::nextBlock() {
/*------------------------------------------------------------------------*/
FilesManager::FilesManager() {
FilesManager::FilesManager(VoyeurEngine *vm) {
_curLibPtr = nullptr;
_boltFilesState._vm = vm;
}
bool FilesManager::openBoltLib(const Common::String &filename, BoltFile *&boltFile) {

3
engines/voyeur/files.h
View File

@ -207,8 +207,7 @@ public:
BoltFilesState _boltFilesState;
BoltFile *_curLibPtr;
public:
FilesManager();
void setVm(VoyeurEngine *vm) { _boltFilesState._vm = vm; }
FilesManager(VoyeurEngine *vm);
bool openBoltLib(const Common::String &filename, BoltFile *&boltFile);
byte *fload(const Common::String &filename, int *size = NULL);

26
engines/voyeur/voyeur.cpp
View File

@ -41,6 +41,7 @@ VoyeurEngine::VoyeurEngine(OSystem *syst, const VoyeurGameDescription *gameDesc)
Common::Point(1, 1), 1, 0, 0) {
_debugger = nullptr;
_eventsManager = nullptr;
_filesManager = nullptr;
_soundManager = nullptr;
_voy = nullptr;
_bVoy = NULL;
@ -68,11 +69,21 @@ VoyeurEngine::VoyeurEngine(OSystem *syst, const VoyeurGameDescription *gameDesc)
initializeManagers();
}
void VoyeurEngine::initializeManagers() {
_graphicsManager.setVm(this);
_debugger = new Debugger(this);
_eventsManager = new EventsManager(this);
_filesManager = new FilesManager(this);
_soundManager = new SoundManager(this, _mixer);
_voy = new SVoy(this);
}
VoyeurEngine::~VoyeurEngine() {
delete _bVoy;
delete _voy;
delete _soundManager;
delete _eventsManager;
delete _filesManager;
delete _debugger;
}
@ -99,15 +110,6 @@ int VoyeurEngine::getRandomNumber(int maxNumber) {
return _randomSource.getRandomNumber(maxNumber);
}
void VoyeurEngine::initializeManagers() {
_filesManager.setVm(this);
_graphicsManager.setVm(this);
_debugger = new Debugger(this);
_eventsManager = new EventsManager(this);
_soundManager = new SoundManager(this, _mixer);
_voy = new SVoy(this);
}
void VoyeurEngine::ESP_Init() {
ThreadResource::init();
@ -118,7 +120,7 @@ void VoyeurEngine::ESP_Init() {
void VoyeurEngine::globalInitBolt() {
initBolt();
_filesManager.openBoltLib("bvoy.blt", _bVoy);
_filesManager->openBoltLib("bvoy.blt", _bVoy);
_bVoy->getBoltGroup(0x000);
_bVoy->getBoltGroup(0x100);
@ -233,8 +235,8 @@ void VoyeurEngine::showConversionScreen() {
bool VoyeurEngine::doLock() {
bool result = true;
int buttonVocSize, wrongVocSize;
byte *buttonVoc = _filesManager.fload("button.voc", &buttonVocSize);
byte *wrongVoc = _filesManager.fload("wrong.voc", &wrongVocSize);
byte *buttonVoc = _filesManager->fload("button.voc", &buttonVocSize);
byte *wrongVoc = _filesManager->fload("wrong.voc", &wrongVocSize);
if (_bVoy->getBoltGroup(0x700)) {
_voy->_viewBounds = _bVoy->boltEntry(0x704)._rectResource;

2
engines/voyeur/voyeur.h
View File

@ -159,7 +159,7 @@ public:
BoltFile *_bVoy;
Debugger *_debugger;
EventsManager *_eventsManager;
FilesManager _filesManager;
FilesManager *_filesManager;
GraphicsManager _graphicsManager;
SoundManager *_soundManager;
SVoy *_voy;

2
engines/voyeur/voyeur_game.cpp
View File

@ -28,7 +28,7 @@ namespace Voyeur {
void VoyeurEngine::playStamp() {
_stampLibPtr = NULL;
_filesManager.openBoltLib("stampblt.blt", _stampLibPtr);
_filesManager->openBoltLib("stampblt.blt", _stampLibPtr);
_stampLibPtr->getBoltGroup(0);
_controlPtr->_state = _stampLibPtr->boltEntry(_controlPtr->_stateId >> 16)._stateResource;