src/ui/FrameXML.cpp

@@ -8,7 +8,6 @@
 #include "ui/simple/CSimpleModel.hpp"
 #include "ui/simple/CSimpleScrollFrame.hpp"
 #include "ui/simple/CSimpleSlider.hpp"
-#include "ui/simple/CSimpleStatusBar.hpp"
 #include "util/CStatus.hpp"
 #include "util/SFile.hpp"
 #include <common/XML.hpp>
@@ -97,9 +96,9 @@ CSimpleFrame* Create_SimpleHTML(CSimpleFrame* parent) {
 }
 
 CSimpleFrame* Create_SimpleStatusBar(CSimpleFrame* parent) {
-    // TODO CDataAllocator
+    // TODO
 
-    return STORM_NEW(CSimpleStatusBar(parent));
+    return nullptr;
 }
 
 CSimpleFrame* Create_SimpleColorSelect(CSimpleFrame* parent) {
@@ -542,19 +541,19 @@ int32_t FrameXML_RegisterFactory(const char* type, CSimpleFrame* (*factory)(CSim
 }
 
 void FrameXML_RegisterDefault() {
-    FrameXML_RegisterFactory("Button", &Create_SimpleButton, false);
+    FrameXML_RegisterFactory("Button", &Create_SimpleButton, 0);
-    FrameXML_RegisterFactory("CheckButton", &Create_SimpleCheckButton, false);
+    FrameXML_RegisterFactory("CheckButton", &Create_SimpleCheckButton, 0);
-    FrameXML_RegisterFactory("EditBox", &Create_SimpleEditBox, false);
+    FrameXML_RegisterFactory("EditBox", &Create_SimpleEditBox, 0);
-    FrameXML_RegisterFactory("Frame", &Create_SimpleFrame, false);
+    FrameXML_RegisterFactory("Frame", &Create_SimpleFrame, 0);
-    FrameXML_RegisterFactory("MessageFrame", &Create_SimpleMessageFrame, false);
+    FrameXML_RegisterFactory("MessageFrame", &Create_SimpleMessageFrame, 0);
-    FrameXML_RegisterFactory("Model", &Create_SimpleModel, false);
+    FrameXML_RegisterFactory("Model", &Create_SimpleModel, 0);
-    FrameXML_RegisterFactory("ScrollFrame", &Create_SimpleScrollFrame, false);
+    FrameXML_RegisterFactory("ScrollFrame", &Create_SimpleScrollFrame, 0);
-    FrameXML_RegisterFactory("ScrollingMessageFrame", &Create_SimpleScrollingMessageFrame, false);
+    FrameXML_RegisterFactory("ScrollingMessageFrame", &Create_SimpleScrollingMessageFrame, 0);
-    FrameXML_RegisterFactory("Slider", &Create_SimpleSlider, false);
+    FrameXML_RegisterFactory("Slider", &Create_SimpleSlider, 0);
-    FrameXML_RegisterFactory("SimpleHTML", &Create_SimpleHTML, false);
+    FrameXML_RegisterFactory("SimpleHTML", &Create_SimpleHTML, 0);
-    FrameXML_RegisterFactory("StatusBar", &Create_SimpleStatusBar, false);
+    FrameXML_RegisterFactory("StatusBar", &Create_SimpleStatusBar, 0);
-    FrameXML_RegisterFactory("ColorSelect", &Create_SimpleColorSelect, false);
+    FrameXML_RegisterFactory("ColorSelect", &Create_SimpleColorSelect, 0);
-    FrameXML_RegisterFactory("MovieFrame", &Create_SimpleMovieFrame, false);
+    FrameXML_RegisterFactory("MovieFrame", &Create_SimpleMovieFrame, 0);
 }
 
 void FrameXML_ReleaseHashNode(const char* name) {

src/ui/game/GMTicketInfoScript.cpp

@@ -2,8 +2,6 @@
 #include "ui/FrameScript.hpp"
 #include "util/Unimplemented.hpp"
 
-namespace {
-
 int32_t Script_GetGMTicket(lua_State* L) {
     WHOA_UNIMPLEMENTED(0);
 }
@@ -64,8 +62,6 @@ int32_t Script_RegisterStaticConstants(lua_State* L) {
     WHOA_UNIMPLEMENTED(0);
 }
 
-}
-
 static FrameScript_Method s_ScriptFunctions[] = {
     { "GetGMTicket",                &Script_GetGMTicket },
     { "NewGMTicket",                &Script_NewGMTicket },

src/ui/game/GameScript.cpp

@@ -8,7 +8,6 @@
 #include "util/Unimplemented.hpp"
 
 namespace {
-
 int32_t Script_FrameXML_Debug(lua_State* L) {
     WHOA_UNIMPLEMENTED(0);
 }

src/ui/game/ScriptEvents.cpp

@@ -3,8 +3,6 @@
 #include "ui/ScriptFunctionsSystem.hpp"
 #include "util/Unimplemented.hpp"
 
-namespace {
-
 int32_t Script_UnitExists(lua_State* L) {
     WHOA_UNIMPLEMENTED(0);
 }
@@ -681,8 +679,6 @@ int32_t Script_FillLocalizedClassList(lua_State* L) {
     WHOA_UNIMPLEMENTED(0);
 }
 
-}
-
 static FrameScript_Method s_UnitFunctions[] = {
     { "UnitExists",                     &Script_UnitExists },
     { "UnitIsVisible",                  &Script_UnitIsVisible },

src/ui/simple/CSimpleStatusBar.cpp

@@ -1,31 +0,0 @@
-#include "ui/simple/CSimpleStatusBar.hpp"
-#include "ui/simple/CSimpleStatusBarScript.hpp"
-
-int32_t CSimpleStatusBar::s_metatable;
-int32_t CSimpleStatusBar::s_objectType;
-
-void CSimpleStatusBar::CreateScriptMetaTable() {
-    auto L = FrameScript_GetContext();
-    CSimpleStatusBar::s_metatable = FrameScript_Object::CreateScriptMetaTable(L, &CSimpleStatusBar::RegisterScriptMethods);
-}
-
-int32_t CSimpleStatusBar::GetObjectType() {
-    if (!CSimpleStatusBar::s_objectType) {
-        CSimpleStatusBar::s_objectType = ++FrameScript_Object::s_objectTypes;
-    }
-
-    return CSimpleStatusBar::s_objectType;
-}
-
-void CSimpleStatusBar::RegisterScriptMethods(lua_State* L) {
-    CSimpleFrame::RegisterScriptMethods(L);
-    FrameScript_Object::FillScriptMethodTable(L, SimpleStatusBarMethods, NUM_SIMPLE_STATUS_BAR_SCRIPT_METHODS);
-}
-
-CSimpleStatusBar::CSimpleStatusBar(CSimpleFrame* parent) : CSimpleFrame(parent) {
-    // TODO
-}
-
-int32_t CSimpleStatusBar::GetScriptMetaTable() {
-    return CSimpleStatusBar::s_metatable;
-}

src/ui/simple/CSimpleStatusBar.hpp

@@ -1,27 +0,0 @@
-#ifndef UI_SIMPLE_C_SIMPLE_STATUS_BAR_HPP
-#define UI_SIMPLE_C_SIMPLE_STATUS_BAR_HPP
-
-#include "ui/simple/CSimpleFrame.hpp"
-
-class CSimpleStatusBar : public CSimpleFrame {
-    public:
-        // Static variables
-        static int32_t s_metatable;
-        static int32_t s_objectType;
-
-        // Static functions
-        static void CreateScriptMetaTable();
-        static int32_t GetObjectType();
-        static void RegisterScriptMethods(lua_State* L);
-
-        // Member variables
-        // TODO
-
-        // Virtual member functions
-        virtual int32_t GetScriptMetaTable();
-
-        // Member functions
-        CSimpleStatusBar(CSimpleFrame* parent);
-};
-
-#endif

src/ui/simple/CSimpleStatusBarScript.cpp

@@ -1,70 +0,0 @@
-#include "ui/simple/CSimpleStatusBarScript.hpp"
-#include "ui/FrameScript.hpp"
-#include "util/Unimplemented.hpp"
-
-namespace {
-
-int32_t CSimpleStatusBar_GetOrientation(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
-}
-
-int32_t CSimpleStatusBar_SetOrientation(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
-}
-
-int32_t CSimpleStatusBar_GetMinMaxValues(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
-}
-
-int32_t CSimpleStatusBar_SetMinMaxValues(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
-}
-
-int32_t CSimpleStatusBar_GetValue(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
-}
-
-int32_t CSimpleStatusBar_SetValue(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
-}
-
-int32_t CSimpleStatusBar_GetStatusBarTexture(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
-}
-
-int32_t CSimpleStatusBar_SetStatusBarTexture(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
-}
-
-int32_t CSimpleStatusBar_GetStatusBarColor(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
-}
-
-int32_t CSimpleStatusBar_SetStatusBarColor(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
-}
-
-int32_t CSimpleStatusBar_GetRotatesTexture(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
-}
-
-int32_t CSimpleStatusBar_SetRotatesTexture(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
-}
-
-}
-
-FrameScript_Method SimpleStatusBarMethods[] = {
-    { "GetOrientation",         &CSimpleStatusBar_GetOrientation },
-    { "SetOrientation",         &CSimpleStatusBar_SetOrientation },
-    { "GetMinMaxValues",        &CSimpleStatusBar_GetMinMaxValues },
-    { "SetMinMaxValues",        &CSimpleStatusBar_SetMinMaxValues },
-    { "GetValue",               &CSimpleStatusBar_GetValue },
-    { "SetValue",               &CSimpleStatusBar_SetValue },
-    { "GetStatusBarTexture",    &CSimpleStatusBar_GetStatusBarTexture },
-    { "SetStatusBarTexture",    &CSimpleStatusBar_SetStatusBarTexture },
-    { "GetStatusBarColor",      &CSimpleStatusBar_GetStatusBarColor },
-    { "SetStatusBarColor",      &CSimpleStatusBar_SetStatusBarColor },
-    { "GetRotatesTexture",      &CSimpleStatusBar_GetRotatesTexture },
-    { "SetRotatesTexture",      &CSimpleStatusBar_SetRotatesTexture },
-};

src/ui/simple/CSimpleStatusBarScript.hpp

@@ -1,10 +0,0 @@
-#ifndef UI_SIMPLE_C_SIMPLE_STATUS_BAR_SCRIPT_HPP
-#define UI_SIMPLE_C_SIMPLE_STATUS_BAR_SCRIPT_HPP
-
-#include "ui/Types.hpp"
-
-#define NUM_SIMPLE_STATUS_BAR_SCRIPT_METHODS 12
-
-extern FrameScript_Method SimpleStatusBarMethods[NUM_SIMPLE_STATUS_BAR_SCRIPT_METHODS];
-
-#endif

src/ui/simple/ScriptMethods.cpp

@@ -12,7 +12,6 @@
 #include "ui/simple/CSimpleModelFFX.hpp"
 #include "ui/simple/CSimpleScrollFrame.hpp"
 #include "ui/simple/CSimpleSlider.hpp"
-#include "ui/simple/CSimpleStatusBar.hpp"
 #include "ui/simple/CSimpleTexture.hpp"
 #include "util/CStatus.hpp"
 #include "util/Lua.hpp"
@@ -191,9 +190,9 @@ void RegisterSimpleFrameScriptMethods() {
     CSimpleModelFFX::CreateScriptMetaTable();
     CSimpleScrollFrame::CreateScriptMetaTable();
     CSimpleSlider::CreateScriptMetaTable();
-    CSimpleStatusBar::CreateScriptMetaTable();
 
     // TODO
+    // CSimpleStatusBar::CreateScriptMetaTable();
     // CSimpleColorSelect::CreateScriptMetaTable();
     // CSimpleMovieFrame::CreateScriptMetaTable();
 }