src/glue/CGlueMgr.cpp

@@ -26,11 +26,11 @@
 #include "ui/FrameXML.hpp"
 #include "ui/Interface.hpp"
 #include "ui/Key.hpp"
+#include "ui/ScriptFunctions.hpp"
 #include "ui/ScriptFunctionsSystem.hpp"
 #include "ui/game/CGVideoOptions.hpp"
 #include "ui/simple/CSimpleModelFFX.hpp"
 #include "ui/simple/CSimpleTop.hpp"
-#include "ui/simple/ScriptMethods.hpp"
 #include "util/Filesystem.hpp"
 #include "util/Locale.hpp"
 #include "util/Log.hpp"
@@ -1187,10 +1187,6 @@ void CGlueMgr::Suspend() {
 
     // TODO
 
-    SystemUnregisterFunctions();
-
-    // TODO
-
     FrameXML_FreeHashNodes();
 
     // TODO

src/ui/FrameScript.cpp

@@ -1047,15 +1047,6 @@ const char* FrameScript_Sprintf(lua_State* L, int32_t idx, char buffer[], uint32
     return buffer;
 }
 
-void FrameScript_UnregisterFunction(const char* name) {
-    auto L = FrameScript::s_context;
-
-    lua_pushnil(L);
-    lua_pushstring(L, name);
-    lua_insert(L, -2);
-    lua_rawset(L, LUA_GLOBALSINDEX);
-}
-
 void FrameScript_UnregisterScriptEvent(FrameScript_Object* object, FrameScript_EventObject* event) {
     if (event->pendingSignalCount) {
         auto node = event->unregisterListeners.Head();

src/ui/FrameScript.hpp

@@ -99,8 +99,6 @@ void FrameScript_SignalEvent(uint32_t index, const char* format, ...);
 
 const char* FrameScript_Sprintf(lua_State* L, int32_t idx, char buffer[], uint32_t bufferLen);
 
-void FrameScript_UnregisterFunction(const char* name);
-
 void FrameScript_UnregisterScriptEvent(FrameScript_Object* object, FrameScript_EventObject* event);
 
 void ScriptEventsInitialize();

src/ui/ScriptFunctions.cpp

@@ -0,0 +1,56 @@
+#include "ui/ScriptFunctions.hpp"
+#include "ui/FrameScript.hpp"
+#include "ui/simple/CSimpleButton.hpp"
+#include "ui/simple/CSimpleCheckbox.hpp"
+#include "ui/simple/CSimpleEditBox.hpp"
+#include "ui/simple/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleHTML.hpp"
+#include "ui/simple/CSimpleModel.hpp"
+#include "ui/simple/CSimpleModelFFX.hpp"
+#include "ui/simple/CSimpleScrollFrame.hpp"
+#include "ui/simple/CSimpleSlider.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
+
+void RegisterSimpleFrameScriptMethods() {
+    for (int32_t i = 0; i < NUM_SCRIPT_FUNCTIONS_SIMPLE_FRAME; ++i) {
+        FrameScript_RegisterFunction(
+            FrameScript::s_ScriptFunctions_SimpleFrame[i].name,
+            FrameScript::s_ScriptFunctions_SimpleFrame[i].method
+        );
+    }
+
+    // TODO
+    // CSimpleAnim::CreateScriptMetaTable();
+    // CSimpleTranslationAnim::CreateScriptMetaTable();
+    // CSimpleRotationAnim::CreateScriptMetaTable();
+    // CSimpleScaleAnim::CreateScriptMetaTable();
+    // CSimpleControlPoint::CreateScriptMetaTable();
+    // CSimplePathAnim::CreateScriptMetaTable();
+    // CSimpleAlphaAnim::CreateScriptMetaTable();
+    // CSimpleAnimGroup::CreateScriptMetaTable();
+
+    CSimpleFont::CreateScriptMetaTable();
+    CSimpleTexture::CreateScriptMetaTable();
+    CSimpleFontString::CreateScriptMetaTable();
+    CSimpleFrame::CreateScriptMetaTable();
+    CSimpleButton::CreateScriptMetaTable();
+    CSimpleCheckbox::CreateScriptMetaTable();
+    CSimpleEditBox::CreateScriptMetaTable();
+    CSimpleHTML::CreateScriptMetaTable();
+
+    // TODO
+    // CSimpleMessageFrame::CreateScriptMetaTable();
+    // CSimpleMessageScrollFrame::CreateScriptMetaTable();
+
+    CSimpleModel::CreateScriptMetaTable();
+    CSimpleModelFFX::CreateScriptMetaTable();
+    CSimpleScrollFrame::CreateScriptMetaTable();
+    CSimpleSlider::CreateScriptMetaTable();
+
+    // TODO
+    // CSimpleStatusBar::CreateScriptMetaTable();
+    // CSimpleColorSelect::CreateScriptMetaTable();
+    // CSimpleMovieFrame::CreateScriptMetaTable();
+}

src/ui/ScriptFunctions.hpp

@@ -0,0 +1,17 @@
+#ifndef UI_SCRIPT_FUNCTIONS_HPP
+#define UI_SCRIPT_FUNCTIONS_HPP
+
+#include "ui/Types.hpp"
+#include <cstdint>
+
+struct lua_State;
+
+#define NUM_SCRIPT_FUNCTIONS_SIMPLE_FRAME 7
+
+namespace FrameScript {
+    extern FrameScript_Method s_ScriptFunctions_SimpleFrame[NUM_SCRIPT_FUNCTIONS_SIMPLE_FRAME];
+}
+
+void RegisterSimpleFrameScriptMethods();
+
+#endif

src/ui/ScriptFunctionsShared.cpp

@@ -1,4 +1,4 @@
-#include "ui/ScriptFunctionsShared.hpp"
+#include "ui/ScriptFunctions.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>

src/ui/ScriptFunctionsSimpleFrame.cpp

@@ -1,24 +1,13 @@
-#include "ui/simple/ScriptMethods.hpp"
 #include "ui/FrameXML.hpp"
+#include "ui/ScriptFunctions.hpp"
 #include "ui/Types.hpp"
-#include "ui/simple/CSimpleButton.hpp"
-#include "ui/simple/CSimpleCheckbox.hpp"
-#include "ui/simple/CSimpleEditBox.hpp"
-#include "ui/simple/CSimpleFont.hpp"
-#include "ui/simple/CSimpleFontString.hpp"
 #include "ui/simple/CSimpleFrame.hpp"
-#include "ui/simple/CSimpleHTML.hpp"
-#include "ui/simple/CSimpleModel.hpp"
-#include "ui/simple/CSimpleModelFFX.hpp"
-#include "ui/simple/CSimpleScrollFrame.hpp"
-#include "ui/simple/CSimpleSlider.hpp"
-#include "ui/simple/CSimpleTexture.hpp"
 #include "util/CStatus.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <common/XML.hpp>
-#include <storm/String.hpp>
 #include <cstdint>
+#include <storm/String.hpp>
 
 int32_t Script_GetText(lua_State* L) {
     WHOA_UNIMPLEMENTED(0);
@@ -148,7 +137,7 @@ int32_t Script_GetCurrentKeyBoardFocus(lua_State* L) {
     WHOA_UNIMPLEMENTED(0);
 }
 
-static FrameScript_Method s_ScriptFunctions[] = {
+FrameScript_Method FrameScript::s_ScriptFunctions_SimpleFrame[NUM_SCRIPT_FUNCTIONS_SIMPLE_FRAME] = {
     { "GetText",                        &Script_GetText },
     { "GetNumFrames",                   &Script_GetNumFrames },
     { "EnumerateFrames",                &Script_EnumerateFrames },
@@ -157,42 +146,3 @@ static FrameScript_Method s_ScriptFunctions[] = {
     { "GetFramesRegisteredForEvent",    &Script_GetFramesRegisteredForEvent },
     { "GetCurrentKeyBoardFocus",        &Script_GetCurrentKeyBoardFocus },
 };
-
-void RegisterSimpleFrameScriptMethods() {
-    for (auto& func : s_ScriptFunctions) {
-        FrameScript_RegisterFunction(func.name, func.method);
-    }
-
-    // TODO
-    // CSimpleAnim::CreateScriptMetaTable();
-    // CSimpleTranslationAnim::CreateScriptMetaTable();
-    // CSimpleRotationAnim::CreateScriptMetaTable();
-    // CSimpleScaleAnim::CreateScriptMetaTable();
-    // CSimpleControlPoint::CreateScriptMetaTable();
-    // CSimplePathAnim::CreateScriptMetaTable();
-    // CSimpleAlphaAnim::CreateScriptMetaTable();
-    // CSimpleAnimGroup::CreateScriptMetaTable();
-
-    CSimpleFont::CreateScriptMetaTable();
-    CSimpleTexture::CreateScriptMetaTable();
-    CSimpleFontString::CreateScriptMetaTable();
-    CSimpleFrame::CreateScriptMetaTable();
-    CSimpleButton::CreateScriptMetaTable();
-    CSimpleCheckbox::CreateScriptMetaTable();
-    CSimpleEditBox::CreateScriptMetaTable();
-    CSimpleHTML::CreateScriptMetaTable();
-
-    // TODO
-    // CSimpleMessageFrame::CreateScriptMetaTable();
-    // CSimpleMessageScrollFrame::CreateScriptMetaTable();
-
-    CSimpleModel::CreateScriptMetaTable();
-    CSimpleModelFFX::CreateScriptMetaTable();
-    CSimpleScrollFrame::CreateScriptMetaTable();
-    CSimpleSlider::CreateScriptMetaTable();
-
-    // TODO
-    // CSimpleStatusBar::CreateScriptMetaTable();
-    // CSimpleColorSelect::CreateScriptMetaTable();
-    // CSimpleMovieFrame::CreateScriptMetaTable();
-}

src/ui/ScriptFunctionsSystem.cpp

@@ -42,9 +42,3 @@ void SystemRegisterFunctions() {
         FrameScript_RegisterFunction(func.name, func.method);
     }
 }
-
-void SystemUnregisterFunctions() {
-    for (auto& func : s_SystemFunctions) {
-        FrameScript_UnregisterFunction(func.name);
-    }
-}

src/ui/ScriptFunctionsSystem.hpp

@@ -3,6 +3,4 @@
 
 void SystemRegisterFunctions();
 
-void SystemUnregisterFunctions();
-
 #endif

src/ui/simple/ScriptMethods.hpp

@@ -1,6 +0,0 @@
-#ifndef UI_SIMPLE_SCRIPT_METHODS_HPP
-#define UI_SIMPLE_SCRIPT_METHODS_HPP
-
-void RegisterSimpleFrameScriptMethods();
-
-#endif