diff options
author | Einar Johan Trøan Sømåen | 2012-07-29 02:59:14 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-07-29 03:41:07 +0200 |
commit | 482a5fb467e6694fb54c75f718563992657edf97 (patch) | |
tree | 6a88e4cc022c62276e53f3dceb8bbc7c5dabe18f /engines/wintermute/base/scriptables/script_engine.cpp | |
parent | 9b5cf8f1bafd5aa0dba9194a8f04e58724652891 (diff) | |
download | scummvm-rg350-482a5fb467e6694fb54c75f718563992657edf97.tar.gz scummvm-rg350-482a5fb467e6694fb54c75f718563992657edf97.tar.bz2 scummvm-rg350-482a5fb467e6694fb54c75f718563992657edf97.zip |
WINTERMUTE: Make the BaseEngine-singleton use Common::Singleton as super-class
Diffstat (limited to 'engines/wintermute/base/scriptables/script_engine.cpp')
-rw-r--r-- | engines/wintermute/base/scriptables/script_engine.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index 9e11a7c5b4..96250dbb90 100644 --- a/engines/wintermute/base/scriptables/script_engine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -128,7 +128,6 @@ bool ScEngine::cleanup() { //////////////////////////////////////////////////////////////////////////
byte *ScEngine::loadFile(void *data, char *filename, uint32 *size) {
- BaseGame *gameRef = (BaseGame *)data;
return BaseFileManager::getEngineInstance()->readWholeFile(filename, size);
}
@@ -201,7 +200,7 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig uint32 size;
- byte *buffer = BaseEngine::getInstance()->getFileManager()->readWholeFile(filename, &size);
+ byte *buffer = BaseEngine::instance().getFileManager()->readWholeFile(filename, &size);
if (!buffer) {
_gameRef->LOG(0, "ScEngine::GetCompiledScript - error opening script '%s'", filename);
return NULL;
@@ -690,10 +689,10 @@ bool ScEngine::saveBreakpoints() { sprintf(key, "Breakpoint%d", count);
sprintf(text, "%s:%d", _breakpoints[i]->_filename.c_str(), _breakpoints[i]->_lines[j]);
- BaseEngine::getInstance()->getRegistry()->writeString("Debug", key, text);
+ BaseEngine::instance().getRegistry()->writeString("Debug", key, text);
}
}
- BaseEngine::getInstance()->getRegistry()->writeInt("Debug", "NumBreakpoints", count);
+ BaseEngine::instance().getRegistry()->writeInt("Debug", "NumBreakpoints", count);
return STATUS_OK;
}
@@ -706,11 +705,11 @@ bool ScEngine::loadBreakpoints() { char key[100];
- int count = BaseEngine::getInstance()->getRegistry()->readInt("Debug", "NumBreakpoints", 0);
+ int count = BaseEngine::instance().getRegistry()->readInt("Debug", "NumBreakpoints", 0);
for (int i = 1; i <= count; i++) {
/* uint32 bufSize = 512; */
sprintf(key, "Breakpoint%d", i);
- AnsiString breakpoint = BaseEngine::getInstance()->getRegistry()->readString("Debug", key, "");
+ AnsiString breakpoint = BaseEngine::instance().getRegistry()->readString("Debug", key, "");
char *path = BaseUtils::strEntry(0, breakpoint.c_str(), ':');
char *line = BaseUtils::strEntry(1, breakpoint.c_str(), ':');
|