diff options
Diffstat (limited to 'engines/sword25/gfx')
| -rw-r--r-- | engines/sword25/gfx/animation.cpp | 4 | ||||
| -rw-r--r-- | engines/sword25/gfx/graphicengine_script.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/sword25/gfx/animation.cpp b/engines/sword25/gfx/animation.cpp index 1790e24c03..5101a8b732 100644 --- a/engines/sword25/gfx/animation.cpp +++ b/engines/sword25/gfx/animation.cpp @@ -673,7 +673,7 @@ void BS_Animation::PersistCallbackVector(BS_OutputPersistenceBlock &Writer, cons // Alle Callbacks einzeln persistieren. Common::Array<ANIMATION_CALLBACK_DATA>::const_iterator It = Vector.begin(); while (It != Vector.end()) { - Writer.Write(BS_CallbackRegistry::GetInstance().ResolveCallbackPointer((void (*)(int))It->Callback)); + Writer.Write(CallbackRegistry::getInstance().resolveCallbackPointer((void (*)(int))It->Callback)); Writer.Write(It->Data); ++It; @@ -696,7 +696,7 @@ void BS_Animation::UnpersistCallbackVector(BS_InputPersistenceBlock &Reader, Com Common::String CallbackFunctionName; Reader.Read(CallbackFunctionName); - CallbackData.Callback = reinterpret_cast<ANIMATION_CALLBACK>(BS_CallbackRegistry::GetInstance().ResolveCallbackFunction(CallbackFunctionName)); + CallbackData.Callback = reinterpret_cast<ANIMATION_CALLBACK>(CallbackRegistry::getInstance().resolveCallbackFunction(CallbackFunctionName)); Reader.Read(CallbackData.Data); diff --git a/engines/sword25/gfx/graphicengine_script.cpp b/engines/sword25/gfx/graphicengine_script.cpp index af558e6578..07a867bf6c 100644 --- a/engines/sword25/gfx/graphicengine_script.cpp +++ b/engines/sword25/gfx/graphicengine_script.cpp @@ -91,9 +91,9 @@ std::auto_ptr<ActionCallback> ActionCallbackPtr; struct CallbackfunctionRegisterer { CallbackfunctionRegisterer() { - BS_CallbackRegistry::GetInstance().RegisterCallbackFunction("LuaLoopPointCB", (void ( *)(int))AnimationLoopPointCallback); - BS_CallbackRegistry::GetInstance().RegisterCallbackFunction("LuaActionCB", (void ( *)(int))AnimationActionCallback); - BS_CallbackRegistry::GetInstance().RegisterCallbackFunction("LuaDeleteCB", (void ( *)(int))AnimationDeleteCallback); + CallbackRegistry::getInstance().registerCallbackFunction("LuaLoopPointCB", (void ( *)(int))AnimationLoopPointCallback); + CallbackRegistry::getInstance().registerCallbackFunction("LuaActionCB", (void ( *)(int))AnimationActionCallback); + CallbackRegistry::getInstance().registerCallbackFunction("LuaDeleteCB", (void ( *)(int))AnimationDeleteCallback); } }; static CallbackfunctionRegisterer Instance; |