diff options
| author | Eugene Sandulenko | 2010-08-18 10:52:00 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:51:37 +0000 |
| commit | e71337861ffece83ca8fe254e411557249118d43 (patch) | |
| tree | 0bb0f97aa5d3f7ce02e8d6af838e59092ae887a9 /engines/sword25/input | |
| parent | 596684101e3431e61dbeabeb81eee66322e15042 (diff) | |
| download | scummvm-rg350-e71337861ffece83ca8fe254e411557249118d43.tar.gz scummvm-rg350-e71337861ffece83ca8fe254e411557249118d43.tar.bz2 scummvm-rg350-e71337861ffece83ca8fe254e411557249118d43.zip | |
SWORD25: brought CallBackRegisry class to our naming standards
svn-id: r53257
Diffstat (limited to 'engines/sword25/input')
| -rw-r--r-- | engines/sword25/input/inputengine_script.cpp | 4 | ||||
| -rw-r--r-- | engines/sword25/input/scummvminput.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/sword25/input/inputengine_script.cpp b/engines/sword25/input/inputengine_script.cpp index d373cdac19..5827e88414 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() { - BS_CallbackRegistry::GetInstance().RegisterCallbackFunction("LuaCommandCB", TheCommandCallback); - BS_CallbackRegistry::GetInstance().RegisterCallbackFunction("LuaCharacterCB", TheCharacterCallback); + CallbackRegistry::getInstance().registerCallbackFunction("LuaCommandCB", TheCommandCallback); + CallbackRegistry::getInstance().registerCallbackFunction("LuaCharacterCB", TheCharacterCallback); } }; static CallbackfunctionRegisterer Instance; diff --git a/engines/sword25/input/scummvminput.cpp b/engines/sword25/input/scummvminput.cpp index 30d2940d73..97273dc8d5 100644 --- a/engines/sword25/input/scummvminput.cpp +++ b/engines/sword25/input/scummvminput.cpp @@ -343,7 +343,7 @@ bool ScummVMInput::Persist(BS_OutputPersistenceBlock &Writer) { { Common::List<CommandCallback>::const_iterator It = m_CommandCallbacks.begin(); while (It != m_CommandCallbacks.end()) { - Writer.Write(BS_CallbackRegistry::GetInstance().ResolveCallbackPointer(*It)); + Writer.Write(CallbackRegistry::getInstance().resolveCallbackPointer(*It)); ++It; } } @@ -355,7 +355,7 @@ bool ScummVMInput::Persist(BS_OutputPersistenceBlock &Writer) { { Common::List<CharacterCallback>::const_iterator It = m_CharacterCallbacks.begin(); while (It != m_CharacterCallbacks.end()) { - Writer.Write(BS_CallbackRegistry::GetInstance().ResolveCallbackPointer(*It)); + Writer.Write(CallbackRegistry::getInstance().resolveCallbackPointer(*It)); ++It; } } @@ -379,7 +379,7 @@ bool ScummVMInput::Unpersist(BS_InputPersistenceBlock &Reader) { Reader.Read(CallbackFunctionName); m_CommandCallbacks.push_back(reinterpret_cast<CommandCallback>( - BS_CallbackRegistry::GetInstance().ResolveCallbackFunction(CallbackFunctionName))); + CallbackRegistry::getInstance().resolveCallbackFunction(CallbackFunctionName))); } // Character-Callbackliste leeren. @@ -394,7 +394,7 @@ bool ScummVMInput::Unpersist(BS_InputPersistenceBlock &Reader) { Common::String CallbackFunctionName; Reader.Read(CallbackFunctionName); - m_CharacterCallbacks.push_back(reinterpret_cast<CharacterCallback>(BS_CallbackRegistry::GetInstance().ResolveCallbackFunction(CallbackFunctionName))); + m_CharacterCallbacks.push_back(reinterpret_cast<CharacterCallback>(CallbackRegistry::getInstance().resolveCallbackFunction(CallbackFunctionName))); } return Reader.IsGood(); |