thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

STARK: Allow resolving resource references

Browse source
This commit is contained in:
Bastien Bouclet 2015-01-01 21:13:33 +01:00
parent 51730689c1
commit 5331b52226
9 changed files with 128 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/stark/stark.cpp
View file

@ -37,6 +37,10 @@
#include "common/system.h"
#include "audio/mixer.h"
namespace Common {
DECLARE_SINGLETON(Stark::StarkServices);
}
namespace Stark {
StarkEngine::StarkEngine(OSystem *syst, const ADGameDescription *gameDesc) :
@ -69,6 +73,8 @@ StarkEngine::~StarkEngine() {
delete _global;
delete _stateProvider;
delete _archiveLoader;
StarkServices::destroy();
}
Common::Error StarkEngine::run() {
@ -83,6 +89,12 @@ Common::Error StarkEngine::run() {
_global = new Global();
_resourceProvider = new ResourceProvider(_archiveLoader, _stateProvider, _global);
// Setup the public services
StarkServices &services = StarkServices::instance();
services.archiveLoader = _archiveLoader;
services.resourceProvider = _resourceProvider;
services.global = _global;
// Load global resources
_resourceProvider->initGlobal();