diff options
| author | Max Horn | 2010-10-13 15:41:00 +0000 |
|---|---|---|
| committer | Max Horn | 2010-10-13 15:41:00 +0000 |
| commit | 8f4f0d16fc4e5cd4803203f2aaeb0ddc99e57204 (patch) | |
| tree | b39380c6702b11d88ba2b95d7d0db9fc9afd62d9 /engines/sword25/input | |
| parent | 17f9913a2419c558276a191be07a45ba8f8fc87f (diff) | |
| download | scummvm-rg350-8f4f0d16fc4e5cd4803203f2aaeb0ddc99e57204.tar.gz scummvm-rg350-8f4f0d16fc4e5cd4803203f2aaeb0ddc99e57204.tar.bz2 scummvm-rg350-8f4f0d16fc4e5cd4803203f2aaeb0ddc99e57204.zip | |
SWORD25: Renamed getInstance() -> instance()
svn-id: r53430
Diffstat (limited to 'engines/sword25/input')
| -rw-r--r-- | engines/sword25/input/inputengine.cpp | 8 | ||||
| -rw-r--r-- | engines/sword25/input/inputengine_script.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/sword25/input/inputengine.cpp b/engines/sword25/input/inputengine.cpp index a57af23e6b..9936a20127 100644 --- a/engines/sword25/input/inputengine.cpp +++ b/engines/sword25/input/inputengine.cpp @@ -339,7 +339,7 @@ bool InputEngine::persist(OutputPersistenceBlock &writer) { { Common::List<CommandCallback>::const_iterator It = m_CommandCallbacks.begin(); while (It != m_CommandCallbacks.end()) { - writer.write(CallbackRegistry::getInstance().resolveCallbackPointer(*It)); + writer.write(CallbackRegistry::instance().resolveCallbackPointer(*It)); ++It; } } @@ -351,7 +351,7 @@ bool InputEngine::persist(OutputPersistenceBlock &writer) { { Common::List<CharacterCallback>::const_iterator It = m_CharacterCallbacks.begin(); while (It != m_CharacterCallbacks.end()) { - writer.write(CallbackRegistry::getInstance().resolveCallbackPointer(*It)); + writer.write(CallbackRegistry::instance().resolveCallbackPointer(*It)); ++It; } } @@ -375,7 +375,7 @@ bool InputEngine::unpersist(InputPersistenceBlock &reader) { reader.read(CallbackFunctionName); m_CommandCallbacks.push_back(reinterpret_cast<CommandCallback>( - CallbackRegistry::getInstance().resolveCallbackFunction(CallbackFunctionName))); + CallbackRegistry::instance().resolveCallbackFunction(CallbackFunctionName))); } // Character-Callbackliste leeren. @@ -390,7 +390,7 @@ bool InputEngine::unpersist(InputPersistenceBlock &reader) { Common::String CallbackFunctionName; reader.read(CallbackFunctionName); - m_CharacterCallbacks.push_back(reinterpret_cast<CharacterCallback>(CallbackRegistry::getInstance().resolveCallbackFunction(CallbackFunctionName))); + m_CharacterCallbacks.push_back(reinterpret_cast<CharacterCallback>(CallbackRegistry::instance().resolveCallbackFunction(CallbackFunctionName))); } return reader.isGood(); diff --git a/engines/sword25/input/inputengine_script.cpp b/engines/sword25/input/inputengine_script.cpp index 38ecc3cf56..bb48a7ade9 100644 --- a/engines/sword25/input/inputengine_script.cpp +++ b/engines/sword25/input/inputengine_script.cpp @@ -97,8 +97,8 @@ Common::SharedPtr<CommandCallbackClass> CommandCallbackPtr; struct CallbackfunctionRegisterer { CallbackfunctionRegisterer() { - CallbackRegistry::getInstance().registerCallbackFunction("LuaCommandCB", TheCommandCallback); - CallbackRegistry::getInstance().registerCallbackFunction("LuaCharacterCB", TheCharacterCallback); + CallbackRegistry::instance().registerCallbackFunction("LuaCommandCB", TheCommandCallback); + CallbackRegistry::instance().registerCallbackFunction("LuaCharacterCB", TheCharacterCallback); } }; static CallbackfunctionRegisterer Instance; |