chore(ui): organize simple classes

src/glue/CCharacterSelection.cpp

@@ -8,7 +8,7 @@
 #include "glue/Types.hpp"
 #include "model/CM2Shared.hpp"
 #include "net/Connection.hpp"
-#include "ui/CSimpleModelFFX.hpp"
+#include "ui/simple/CSimpleModelFFX.hpp"
 
 int32_t CCharacterSelection::s_characterCount;
 TSGrowableArray<CharacterSelectionDisplay> CCharacterSelection::s_characterList;

src/glue/CGlueMgr.cpp

@@ -17,13 +17,13 @@
 #include "net/Connection.hpp"
 #include "net/Login.hpp"
 #include "sound/SI2.hpp"
-#include "ui/CSimpleModelFFX.hpp"
-#include "ui/CSimpleTop.hpp"
 #include "ui/FrameScript.hpp"
 #include "ui/FrameXML.hpp"
 #include "ui/Interface.hpp"
 #include "ui/ScriptFunctions.hpp"
 #include "ui/game/CGVideoOptions.hpp"
+#include "ui/simple/CSimpleModelFFX.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/Filesystem.hpp"
 #include "util/Locale.hpp"
 #include "util/Log.hpp"

src/glue/CharacterSelectionDisplay.cpp

@@ -1,9 +1,9 @@
 #include "glue/CharacterSelectionDisplay.hpp"
+#include "component/CCharacterComponent.hpp"
 #include "db/Db.hpp"
 #include "glue/CCharacterSelection.hpp"
-#include "component/CCharacterComponent.hpp"
 #include "object/client/Player_C.hpp"
-#include "ui/CSimpleModelFFX.hpp"
+#include "ui/simple/CSimpleModelFFX.hpp"
 
 void CharacterSelectionDisplay::CreateModelData() {
     auto modelData = Player_C_GetModelName(this->m_info.raceID, this->m_info.sexID);

src/ui/CBackdropGenerator.cpp

@@ -1,6 +1,6 @@
 #include "ui/CBackdropGenerator.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "ui/LoadXML.hpp"
 #include "ui/Util.hpp"
 #include "util/CStatus.hpp"

src/ui/CFrameStrata.cpp

@@ -1,6 +1,6 @@
 #include "ui/CFrameStrata.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleRender.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleRender.hpp"
 
 int32_t CFrameStrataNode::BuildBatches() {
     if (!this->batchDirty) {

src/ui/CFrameStrata.hpp

@@ -2,7 +2,7 @@
 #define UI_C_FRAME_STRATA_HPP
 
 #include "ui/CRenderBatch.hpp"
-#include "ui/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 #include <cstdint>
 #include <storm/Array.hpp>
 #include <storm/List.hpp>

src/ui/CMakeLists.txt

@@ -1,6 +1,7 @@
 file(GLOB PRIVATE_SOURCES
     "*.cpp"
     "game/*.cpp"
+    "simple/*.cpp"
 )
 
 add_library(ui STATIC

src/ui/CRenderBatch.cpp

@@ -1,10 +1,10 @@
 #include "ui/CRenderBatch.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleTexture.hpp"
 #include "gx/Coordinate.hpp"
 #include "gx/Font.hpp"
 #include "gx/Shader.hpp"
 #include "gx/font/CGxStringBatch.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include <cstdlib>
 #include <storm/Error.hpp>
 

src/ui/CScriptRegion.cpp

@@ -1,7 +1,7 @@
 #include "ui/CScriptRegion.hpp"
 #include "ui/CScriptObject.hpp"
 #include "ui/CScriptRegionScript.hpp"
-#include "ui/CSimpleTop.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/Lua.hpp"
 #include <common/XML.hpp>
 

src/ui/CScriptRegionScript.cpp

@@ -1,10 +1,10 @@
 #include "ui/CScriptRegionScript.hpp"
 #include "gx/Coordinate.hpp"
-#include "ui/CSimpleFontString.hpp"
 #include "ui/CScriptRegion.hpp"
-#include "ui/CSimpleTexture.hpp"
-#include "ui/CSimpleTop.hpp"
 #include "ui/FrameScript_Object.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
 #include "util/Unimplemented.hpp"

src/ui/FrameXML.cpp

@@ -1,18 +1,18 @@
 #include "ui/FrameXML.hpp"
-#include "ui/CSimpleButton.hpp"
-#include "ui/CSimpleCheckbox.hpp"
-#include "ui/CSimpleEditBox.hpp"
-#include "ui/CSimpleFont.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleHTML.hpp"
-#include "ui/CSimpleModel.hpp"
-#include "ui/CSimpleScrollFrame.hpp"
-#include "ui/CSimpleSlider.hpp"
+#include "ui/simple/CSimpleButton.hpp"
+#include "ui/simple/CSimpleCheckbox.hpp"
+#include "ui/simple/CSimpleEditBox.hpp"
+#include "ui/simple/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleHTML.hpp"
+#include "ui/simple/CSimpleModel.hpp"
+#include "ui/simple/CSimpleScrollFrame.hpp"
+#include "ui/simple/CSimpleSlider.hpp"
 #include "util/CStatus.hpp"
 #include "util/SFile.hpp"
+#include <common/XML.hpp>
 #include <cstdlib>
 #include <cstring>
-#include <common/XML.hpp>
 #include <storm/String.hpp>
 
 int32_t FrameXML::s_debugLevel;

src/ui/LoadXML.cpp

@@ -1,7 +1,7 @@
 #include "ui/LoadXML.hpp"
 #include "gx/Coordinate.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "util/CStatus.hpp"
 #include <common/XML.hpp>
 #include <storm/String.hpp>

src/ui/ScriptFunctions.cpp

@@ -1,17 +1,17 @@
 #include "ui/ScriptFunctions.hpp"
-#include "ui/CSimpleButton.hpp"
-#include "ui/CSimpleCheckbox.hpp"
-#include "ui/CSimpleEditBox.hpp"
-#include "ui/CSimpleFont.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleHTML.hpp"
-#include "ui/CSimpleModel.hpp"
-#include "ui/CSimpleModelFFX.hpp"
-#include "ui/CSimpleScrollFrame.hpp"
-#include "ui/CSimpleSlider.hpp"
-#include "ui/CSimpleTexture.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 CharacterCreateRegisterScriptFunctions() {
     for (int32_t i = 0; i < NUM_SCRIPT_FUNCTIONS_CHAR_CREATE; ++i) {

src/ui/ScriptFunctionsCharSelect.cpp

@@ -1,9 +1,9 @@
-#include "ui/ScriptFunctions.hpp"
 #include "db/Db.hpp"
 #include "glue/CCharacterSelection.hpp"
 #include "object/client/Unit_C.hpp"
-#include "ui/CSimpleModelFFX.hpp"
+#include "ui/ScriptFunctions.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleModelFFX.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>

src/ui/ScriptFunctionsGlueScriptEvents.cpp

@@ -1,4 +1,3 @@
-#include "ui/ScriptFunctions.hpp"
 #include "client/Client.hpp"
 #include "client/ClientServices.hpp"
 #include "console/CVar.hpp"
@@ -7,8 +6,9 @@
 #include "gx/Coordinate.hpp"
 #include "net/connection/ClientConnection.hpp"
 #include "sound/Interface.hpp"
-#include "ui/CSimpleTop.hpp"
+#include "ui/ScriptFunctions.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/Lua.hpp"
 #include "util/SFile.hpp"
 #include "util/Unimplemented.hpp"

src/ui/ScriptFunctionsSimpleFrame.cpp

@@ -1,12 +1,12 @@
-#include "ui/ScriptFunctions.hpp"
-#include "ui/CSimpleFrame.hpp"
 #include "ui/FrameXML.hpp"
+#include "ui/ScriptFunctions.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "util/CStatus.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
-#include "util/CStatus.hpp"
-#include <cstdint>
 #include <common/XML.hpp>
+#include <cstdint>
 #include <storm/String.hpp>
 
 int32_t Script_GetText(lua_State* L) {

src/ui/simple/CSimpleButton.cpp

@@ -1,11 +1,11 @@
-#include "ui/CSimpleButton.hpp"
+#include "ui/simple/CSimpleButton.hpp"
 #include "event/Input.hpp"
-#include "ui/CSimpleButtonScript.hpp"
-#include "ui/CSimpleFont.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleTexture.hpp"
-#include "ui/CSimpleTop.hpp"
 #include "ui/LoadXML.hpp"
+#include "ui/simple/CSimpleButtonScript.hpp"
+#include "ui/simple/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/CStatus.hpp"
 #include "util/Lua.hpp"
 #include <common/Time.hpp>

src/ui/simple/CSimpleButton.hpp

@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_BUTTON_HPP
-#define UI_C_SIMPLE_BUTTON_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_BUTTON_HPP
+#define UI_SIMPLE_C_SIMPLE_BUTTON_HPP
 
-#include "ui/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 #include <tempest/Vector.hpp>
 
 class CSimpleFont;

src/ui/simple/CSimpleButtonScript.cpp

@@ -1,9 +1,9 @@
-#include "ui/CSimpleButtonScript.hpp"
+#include "ui/simple/CSimpleButtonScript.hpp"
 #include "gx/Coordinate.hpp"
-#include "ui/CSimpleButton.hpp"
-#include "ui/CSimpleFont.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleButton.hpp"
+#include "ui/simple/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
 #include "util/Unimplemented.hpp"

src/ui/simple/CSimpleButtonScript.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_BUTTON_SCRIPT_HPP
-#define UI_C_SIMPLE_BUTTON_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_BUTTON_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_BUTTON_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 

src/ui/simple/CSimpleCheckbox.cpp

@@ -1,7 +1,7 @@
-#include "ui/CSimpleCheckbox.hpp"
-#include "ui/CSimpleCheckboxScript.hpp"
-#include "ui/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleCheckbox.hpp"
 #include "ui/LoadXML.hpp"
+#include "ui/simple/CSimpleCheckboxScript.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "util/StringTo.hpp"
 #include <common/XML.hpp>
 

src/ui/simple/CSimpleCheckbox.hpp

@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_CHECKBOX_HPP
-#define UI_C_SIMPLE_CHECKBOX_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_CHECKBOX_HPP
+#define UI_SIMPLE_C_SIMPLE_CHECKBOX_HPP
 
-#include "ui/CSimpleButton.hpp"
+#include "ui/simple/CSimpleButton.hpp"
 
 class CSimpleCheckbox : public CSimpleButton {
     public:

src/ui/simple/CSimpleCheckboxScript.cpp

@@ -1,5 +1,5 @@
-#include "ui/CSimpleCheckboxScript.hpp"
-#include "ui/CSimpleCheckbox.hpp"
+#include "ui/simple/CSimpleCheckboxScript.hpp"
+#include "ui/simple/CSimpleCheckbox.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
 #include "util/Unimplemented.hpp"

src/ui/simple/CSimpleCheckboxScript.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_CHECKBOX_SCRIPT_HPP
-#define UI_C_SIMPLE_CHECKBOX_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_CHECKBOX_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_CHECKBOX_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 

src/ui/simple/CSimpleEditBox.cpp

@@ -1,20 +1,20 @@
-#include "ui/CSimpleEditBox.hpp"
-#include "gx/Gx.hpp"
+#include "ui/simple/CSimpleEditBox.hpp"
 #include "gx/Coordinate.hpp"
-#include "ui/CSimpleEditBoxScript.hpp"
-#include "ui/CSimpleFontedFrameFont.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleTexture.hpp"
-#include "ui/CSimpleTop.hpp"
+#include "gx/Gx.hpp"
 #include "ui/LoadXML.hpp"
+#include "ui/simple/CSimpleEditBoxScript.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFontedFrameFont.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/Byte.hpp"
 #include "util/CStatus.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
-#include <cstring>
 #include <common/XML.hpp>
 #include <storm/String.hpp>
 #include <storm/Unicode.hpp>
+#include <cstring>
 
 CSimpleEditBox* CSimpleEditBox::s_currentFocus;
 int32_t CSimpleEditBox::s_metatable;

src/ui/simple/CSimpleEditBox.hpp

@@ -1,8 +1,8 @@
-#ifndef UI_C_SIMPLE_EDIT_BOX_HPP
-#define UI_C_SIMPLE_EDIT_BOX_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_EDIT_BOX_HPP
+#define UI_SIMPLE_C_SIMPLE_EDIT_BOX_HPP
 
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleFontedFrame.hpp"
+#include "ui/simple/CSimpleFontedFrame.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 
 class CObserver;
 class CSimpleFontString;

src/ui/simple/CSimpleEditBoxScript.cpp

@@ -1,5 +1,5 @@
-#include "ui/CSimpleEditBoxScript.hpp"
-#include "ui/CSimpleEditBox.hpp"
+#include "ui/simple/CSimpleEditBoxScript.hpp"
+#include "ui/simple/CSimpleEditBox.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>

src/ui/simple/CSimpleEditBoxScript.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_EDIT_BOX_SCRIPT_HPP
-#define UI_C_SIMPLE_EDIT_BOX_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_EDIT_BOX_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_EDIT_BOX_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 

src/ui/simple/CSimpleFont.cpp

@@ -1,10 +1,10 @@
-#include "ui/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFont.hpp"
 #include "gx/Coordinate.hpp"
 #include "gx/Font.hpp"
-#include "ui/CSimpleFontScript.hpp"
 #include "ui/FrameXML.hpp"
 #include "ui/LoadXML.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleFontScript.hpp"
 #include "util/CStatus.hpp"
 #include "util/StringTo.hpp"
 #include <common/XML.hpp>

src/ui/simple/CSimpleFont.hpp

@@ -1,12 +1,12 @@
-#ifndef UI_C_SIMPLE_FONT_HPP
-#define UI_C_SIMPLE_FONT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONT_HPP
+#define UI_SIMPLE_C_SIMPLE_FONT_HPP
 
-#include "ui/CSimpleFontable.hpp"
-#include "ui/CSimpleFontStringAttributes.hpp"
 #include "ui/FrameScript_Object.hpp"
-#include <cstdint>
+#include "ui/simple/CSimpleFontStringAttributes.hpp"
+#include "ui/simple/CSimpleFontable.hpp"
 #include <storm/Hash.hpp>
 #include <storm/List.hpp>
+#include <cstdint>
 
 class CSimpleFont;
 class CStatus;

src/ui/simple/CSimpleFontScript.cpp

@@ -1,5 +1,5 @@
-#include "ui/CSimpleFontScript.hpp"
-#include "ui/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontScript.hpp"
+#include "ui/simple/CSimpleFont.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>

src/ui/simple/CSimpleFontScript.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_FONT_SCRIPT_HPP
-#define UI_C_SIMPLE_FONT_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONT_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_FONT_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 

src/ui/simple/CSimpleFontString.cpp

@@ -1,16 +1,16 @@
-#include "ui/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
 #include "gx/Coordinate.hpp"
 #include "math/Utils.hpp"
 #include "ui/CFramePoint.hpp"
 #include "ui/CRenderBatch.hpp"
-#include "ui/CSimpleFont.hpp"
-#include "ui/CSimpleFontStringScript.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleTop.hpp"
 #include "ui/FrameXML.hpp"
 #include "ui/LoadXML.hpp"
 #include "ui/Types.hpp"
 #include "ui/Util.hpp"
+#include "ui/simple/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontStringScript.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/CStatus.hpp"
 #include "util/StringTo.hpp"
 #include <common/XML.hpp>

src/ui/simple/CSimpleFontString.hpp

@@ -1,9 +1,9 @@
-#ifndef UI_C_SIMPLE_FONT_STRING_HPP
-#define UI_C_SIMPLE_FONT_STRING_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONT_STRING_HPP
+#define UI_SIMPLE_C_SIMPLE_FONT_STRING_HPP
 
 #include "gx/Font.hpp"
-#include "ui/CSimpleFontable.hpp"
-#include "ui/CSimpleRegion.hpp"
+#include "ui/simple/CSimpleFontable.hpp"
+#include "ui/simple/CSimpleRegion.hpp"
 
 class CRenderBatch;
 class CSimpleFrame;

src/ui/simple/CSimpleFontStringAttributes.cpp

@@ -1,7 +1,7 @@
-#include "ui/CSimpleFontStringAttributes.hpp"
+#include "ui/simple/CSimpleFontStringAttributes.hpp"
 #include "gx/Font.hpp"
 #include "math/Utils.hpp"
-#include "ui/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
 #include <storm/Error.hpp>
 
 void CSimpleFontStringAttributes::SetColor(const CImVector& color) {

src/ui/simple/CSimpleFontStringAttributes.hpp

@@ -1,9 +1,9 @@
-#ifndef UI_C_SIMPLE_FONT_STRING_ATTRIBUTES_HPP
-#define UI_C_SIMPLE_FONT_STRING_ATTRIBUTES_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONT_STRING_ATTRIBUTES_HPP
+#define UI_SIMPLE_C_SIMPLE_FONT_STRING_ATTRIBUTES_HPP
 
-#include <cstdint>
 #include <common/String.hpp>
 #include <tempest/Vector.hpp>
+#include <cstdint>
 
 class CSimpleFontString;
 

src/ui/simple/CSimpleFontStringScript.cpp

@@ -1,6 +1,6 @@
-#include "ui/CSimpleFontStringScript.hpp"
-#include "ui/CSimpleFont.hpp"
-#include "ui/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFontStringScript.hpp"
+#include "ui/simple/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
 #include "util/Unimplemented.hpp"

src/ui/simple/CSimpleFontStringScript.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_FONT_STRING_SCRIPT_HPP
-#define UI_C_SIMPLE_FONT_STRING_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONT_STRING_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_FONT_STRING_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 

src/ui/simple/CSimpleFontable.cpp

@@ -1,5 +1,5 @@
-#include "ui/CSimpleFontable.hpp"
-#include "ui/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontable.hpp"
+#include "ui/simple/CSimpleFont.hpp"
 
 CSimpleFontable::~CSimpleFontable() {
     this->SetFontObject(nullptr);

src/ui/simple/CSimpleFontable.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_FONTABLE_HPP
-#define UI_C_SIMPLE_FONTABLE_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONTABLE_HPP
+#define UI_SIMPLE_C_SIMPLE_FONTABLE_HPP
 
 #include "ui/Types.hpp"
 #include <storm/List.hpp>

src/ui/simple/CSimpleFontedFrame.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_FONTED_FRAME_HPP
-#define UI_C_SIMPLE_FONTED_FRAME_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONTED_FRAME_HPP
+#define UI_SIMPLE_C_SIMPLE_FONTED_FRAME_HPP
 
 #include <cstdint>
 

src/ui/simple/CSimpleFontedFrameFont.hpp

@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_FONTED_FRAME_FONT_HPP
-#define UI_C_SIMPLE_FONTED_FRAME_FONT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONTED_FRAME_FONT_HPP
+#define UI_SIMPLE_C_SIMPLE_FONTED_FRAME_FONT_HPP
 
-#include "ui/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFont.hpp"
 
 class CSimpleFontedFrame;
 

src/ui/simple/CSimpleFrame.cpp

@@ -1,27 +1,27 @@
-#include "ui/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 #include "event/Event.hpp"
 #include "event/Input.hpp"
 #include "gx/Coordinate.hpp"
 #include "math/Utils.hpp"
 #include "ui/CBackdropGenerator.hpp"
 #include "ui/CScriptRegion.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleFrameScript.hpp"
-#include "ui/CSimpleRender.hpp"
-#include "ui/CSimpleScrollFrame.hpp"
-#include "ui/CSimpleTitleRegion.hpp"
-#include "ui/CSimpleTexture.hpp"
-#include "ui/CSimpleTop.hpp"
 #include "ui/FrameScript_Object.hpp"
 #include "ui/FrameXML.hpp"
 #include "ui/LoadXML.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFrameScript.hpp"
+#include "ui/simple/CSimpleRender.hpp"
+#include "ui/simple/CSimpleScrollFrame.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTitleRegion.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
-#include <algorithm>
 #include <common/XML.hpp>
 #include <storm/Error.hpp>
 #include <storm/String.hpp>
 #include <storm/Unicode.hpp>
+#include <algorithm>
 
 int32_t CSimpleFrame::s_metatable;
 int32_t CSimpleFrame::s_objectType;

src/ui/simple/CSimpleFrame.hpp

@@ -1,13 +1,13 @@
-#ifndef UI_C_SIMPLE_FRAME_HPP
-#define UI_C_SIMPLE_FRAME_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FRAME_HPP
+#define UI_SIMPLE_C_SIMPLE_FRAME_HPP
 
 #include "event/CEvent.hpp"
 #include "ui/CRenderBatch.hpp"
 #include "ui/CScriptRegion.hpp"
-#include "ui/CSimpleRegion.hpp"
 #include "ui/Types.hpp"
-#include <cstdint>
+#include "ui/simple/CSimpleRegion.hpp"
 #include <storm/List.hpp>
+#include <cstdint>
 
 class CBackdropGenerator;
 class CCharEvent;

src/ui/simple/CSimpleFrameScript.cpp

@@ -1,8 +1,8 @@
-#include "ui/CSimpleFrameScript.hpp"
+#include "ui/simple/CSimpleFrameScript.hpp"
 #include "gx/Coordinate.hpp"
 #include "ui/CBackdropGenerator.hpp"
-#include "ui/CSimpleFrame.hpp"
 #include "ui/FrameScript.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <algorithm>

src/ui/simple/CSimpleFrameScript.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_FRAME_SCRIPT_HPP
-#define UI_C_SIMPLE_FRAME_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FRAME_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_FRAME_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 

src/ui/simple/CSimpleHTML.cpp

@@ -1,8 +1,8 @@
-#include "ui/CSimpleHTML.hpp"
-#include "ui/CSimpleFontedFrameFont.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleHTMLScript.hpp"
-#include "ui/CSimpleTop.hpp"
+#include "ui/simple/CSimpleHTML.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFontedFrameFont.hpp"
+#include "ui/simple/CSimpleHTMLScript.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/CStatus.hpp"
 #include "util/SFile.hpp"
 #include "util/StringTo.hpp"

src/ui/simple/CSimpleHTML.hpp

@@ -1,9 +1,9 @@
-#ifndef UI_C_SIMPLE_HTML_HPP
-#define UI_C_SIMPLE_HTML_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_HTML_HPP
+#define UI_SIMPLE_C_SIMPLE_HTML_HPP
 
-#include "ui/CSimpleFontedFrame.hpp"
-#include "ui/CSimpleHyperlinkedFrame.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleFontedFrame.hpp"
+#include "ui/simple/CSimpleHyperlinkedFrame.hpp"
 #include <storm/List.hpp>
 
 class CStatus;

src/ui/simple/CSimpleHTMLScript.cpp

@@ -1,5 +1,5 @@
-#include "ui/CSimpleHTMLScript.hpp"
-#include "ui/CSimpleHTML.hpp"
+#include "ui/simple/CSimpleHTMLScript.hpp"
+#include "ui/simple/CSimpleHTML.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>

src/ui/simple/CSimpleHTMLScript.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_HTML_SCRIPT_HPP
-#define UI_C_SIMPLE_HTML_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_HTML_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_HTML_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 

src/ui/simple/CSimpleHyperlinkedFrame.cpp

@@ -1,4 +1,4 @@
-#include "ui/CSimpleHyperlinkedFrame.hpp"
+#include "ui/simple/CSimpleHyperlinkedFrame.hpp"
 
 CSimpleHyperlinkedFrame::CSimpleHyperlinkedFrame(CSimpleFrame* parent) : CSimpleFrame(parent) {
     // TODO

src/ui/simple/CSimpleHyperlinkedFrame.hpp

@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_HYPERLINKED_FRAME_HPP
-#define UI_C_SIMPLE_HYPERLINKED_FRAME_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_HYPERLINKED_FRAME_HPP
+#define UI_SIMPLE_C_SIMPLE_HYPERLINKED_FRAME_HPP
 
-#include "ui/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 
 class CSimpleHyperlinkedFrame : public CSimpleFrame {
     public:

src/ui/simple/CSimpleModel.cpp

@@ -1,4 +1,4 @@
-#include "ui/CSimpleModel.hpp"
+#include "ui/simple/CSimpleModel.hpp"
 #include "gx/Camera.hpp"
 #include "gx/Coordinate.hpp"
 #include "gx/Draw.hpp"
@@ -7,8 +7,8 @@
 #include "math/Utils.hpp"
 #include "model/CM2Shared.hpp"
 #include "model/M2Data.hpp"
-#include "ui/CSimpleModelScript.hpp"
 #include "ui/LoadXML.hpp"
+#include "ui/simple/CSimpleModelScript.hpp"
 #include <common/XML.hpp>
 #include <tempest/Math.hpp>
 

src/ui/simple/CSimpleModel.hpp

@@ -1,11 +1,11 @@
-#ifndef C_SIMPLE_MODEL_HPP
-#define C_SIMPLE_MODEL_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_MODEL_HPP
+#define UI_SIMPLE_C_SIMPLE_MODEL_HPP
 
 #include "gx/Camera.hpp"
-#include "ui/CSimpleFrame.hpp"
 #include "model/Model2.hpp"
-#include <tempest/Vector.hpp>
+#include "ui/simple/CSimpleFrame.hpp"
 #include <tempest/Box.hpp>
+#include <tempest/Vector.hpp>
 
 class CStatus;
 class XMLNode;

src/ui/simple/CSimpleModelFFX.cpp

@@ -1,7 +1,7 @@
-#include "ui/CSimpleModelFFX.hpp"
+#include "ui/simple/CSimpleModelFFX.hpp"
 #include "gx/Draw.hpp"
 #include "ui/CRenderBatch.hpp"
-#include "ui/CSimpleModelFFXScript.hpp"
+#include "ui/simple/CSimpleModelFFXScript.hpp"
 #include <storm/Memory.hpp>
 
 int32_t CSimpleModelFFX::s_metatable;

src/ui/simple/CSimpleModelFFX.hpp

@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_MODEL_FFX_HPP
-#define UI_C_SIMPLE_MODEL_FFX_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_MODEL_FFX_HPP
+#define UI_SIMPLE_C_SIMPLE_MODEL_FFX_HPP
 
-#include "ui/CSimpleModel.hpp"
+#include "ui/simple/CSimpleModel.hpp"
 
 class CSimpleFrame;
 

src/ui/simple/CSimpleModelFFXScript.cpp

@@ -1,4 +1,4 @@
-#include "ui/CSimpleModelFFXScript.hpp"
+#include "ui/simple/CSimpleModelFFXScript.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>
 

src/ui/simple/CSimpleModelFFXScript.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_MODEL_FFX_SCRIPT_HPP
-#define UI_C_SIMPLE_MODEL_FFX_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_MODEL_FFX_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_MODEL_FFX_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 

src/ui/simple/CSimpleModelScript.cpp

@@ -1,5 +1,5 @@
-#include "ui/CSimpleModelScript.hpp"
-#include "ui/CSimpleModel.hpp"
+#include "ui/simple/CSimpleModelScript.hpp"
+#include "ui/simple/CSimpleModel.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>

src/ui/simple/CSimpleModelScript.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_MODEL_SCRIPT_HPP
-#define UI_C_SIMPLE_MODEL_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_MODEL_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_MODEL_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 

src/ui/simple/CSimpleRegion.cpp

@@ -1,5 +1,5 @@
-#include "ui/CSimpleRegion.hpp"
-#include "ui/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleRegion.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 #include <cstring>
 
 CSimpleRegion::~CSimpleRegion() {

src/ui/simple/CSimpleRegion.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_REGION_HPP
-#define UI_C_SIMPLE_REGION_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_REGION_HPP
+#define UI_SIMPLE_C_SIMPLE_REGION_HPP
 
 #include "ui/CScriptRegion.hpp"
 #include <storm/List.hpp>

src/ui/simple/CSimpleRender.cpp

@@ -1,4 +1,4 @@
-#include "ui/CSimpleRender.hpp"
+#include "ui/simple/CSimpleRender.hpp"
 #include "gx/Buffer.hpp"
 #include "gx/Device.hpp"
 #include "gx/Draw.hpp"

src/ui/simple/CSimpleRender.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_RENDER_HPP
-#define UI_C_SIMPLE_RENDER_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_RENDER_HPP
+#define UI_SIMPLE_C_SIMPLE_RENDER_HPP
 
 class CGxShader;
 class CRenderBatch;

src/ui/simple/CSimpleScrollFrame.cpp

@@ -1,16 +1,16 @@
-#include "ui/CSimpleScrollFrame.hpp"
+#include "ui/simple/CSimpleScrollFrame.hpp"
 #include "gx/Camera.hpp"
 #include "gx/Coordinate.hpp"
 #include "gx/Transform.hpp"
 #include "ui/CRenderBatch.hpp"
-#include "ui/CSimpleScrollFrameScript.hpp"
 #include "ui/FrameXML.hpp"
+#include "ui/simple/CSimpleScrollFrameScript.hpp"
 #include "util/CStatus.hpp"
 #include "util/Lua.hpp"
-#include <cmath>
-#include <limits>
 #include <common/XML.hpp>
 #include <tempest/Matrix.hpp>
+#include <cmath>
+#include <limits>
 
 int32_t CSimpleScrollFrame::s_metatable;
 int32_t CSimpleScrollFrame::s_objectType;

src/ui/simple/CSimpleScrollFrame.hpp

@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_SCROLL_FRAME_HPP
-#define UI_C_SIMPLE_SCROLL_FRAME_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_SCROLL_FRAME_HPP
+#define UI_SIMPLE_C_SIMPLE_SCROLL_FRAME_HPP
 
-#include "ui/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 #include <tempest/Vector.hpp>
 
 class CRect;

src/ui/simple/CSimpleScrollFrameScript.cpp

@@ -1,6 +1,6 @@
-#include "ui/CSimpleScrollFrameScript.hpp"
+#include "ui/simple/CSimpleScrollFrameScript.hpp"
 #include "gx/Coordinate.hpp"
-#include "ui/CSimpleScrollFrame.hpp"
+#include "ui/simple/CSimpleScrollFrame.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>

src/ui/simple/CSimpleScrollFrameScript.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_SCROLL_FRAME_SCRIPT_HPP
-#define UI_C_SIMPLE_SCROLL_FRAME_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_SCROLL_FRAME_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_SCROLL_FRAME_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 

src/ui/simple/CSimpleSlider.cpp

@@ -1,8 +1,8 @@
-#include "ui/CSimpleSlider.hpp"
+#include "ui/simple/CSimpleSlider.hpp"
 #include "math/Utils.hpp"
-#include "ui/CSimpleSliderScript.hpp"
-#include "ui/CSimpleTexture.hpp"
 #include "ui/LoadXML.hpp"
+#include "ui/simple/CSimpleSliderScript.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
 #include <common/XML.hpp>

src/ui/simple/CSimpleSlider.hpp

@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_SLIDER_HPP
-#define UI_C_SIMPLE_SLIDER_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_SLIDER_HPP
+#define UI_SIMPLE_C_SIMPLE_SLIDER_HPP
 
-#include "ui/CSimpleFrame.hpp"
+#include "CSimpleFrame.hpp"
 
 class CSimpleSlider : public CSimpleFrame {
     public:

src/ui/simple/CSimpleSliderScript.cpp

@@ -1,5 +1,5 @@
-#include "ui/CSimpleSliderScript.hpp"
-#include "ui/CSimpleSlider.hpp"
+#include "ui/simple/CSimpleSliderScript.hpp"
+#include "ui/simple/CSimpleSlider.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>

src/ui/simple/CSimpleSliderScript.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_SLIDER_SCRIPT_HPP
-#define UI_C_SIMPLE_SLIDER_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_SLIDER_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_SLIDER_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 

src/ui/simple/CSimpleTexture.cpp

@@ -1,14 +1,14 @@
-#include "ui/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "gx/Coordinate.hpp"
 #include "gx/Device.hpp"
 #include "gx/Shader.hpp"
 #include "ui/CFramePoint.hpp"
 #include "ui/CRenderBatch.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleTextureScript.hpp"
 #include "ui/FrameXML.hpp"
 #include "ui/LoadXML.hpp"
 #include "ui/Util.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleTextureScript.hpp"
 #include "util/StringTo.hpp"
 #include <algorithm>
 #include <climits>

src/ui/simple/CSimpleTexture.hpp

@@ -1,9 +1,9 @@
-#ifndef UI_C_SIMPLE_TEXTURE_HPP
-#define UI_C_SIMPLE_TEXTURE_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_TEXTURE_HPP
+#define UI_SIMPLE_C_SIMPLE_TEXTURE_HPP
 
 #include "gx/Texture.hpp"
-#include "ui/CSimpleRegion.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleRegion.hpp"
 #include <tempest/Vector.hpp>
 
 class CGxShader;

src/ui/simple/CSimpleTextureScript.cpp

@@ -1,6 +1,6 @@
-#include "ui/CSimpleTextureScript.hpp"
-#include "ui/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTextureScript.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>

src/ui/simple/CSimpleTextureScript.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_TEXTURE_SCRIPT_HPP
-#define UI_C_SIMPLE_TEXTURE_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_TEXTURE_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_TEXTURE_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 

src/ui/simple/CSimpleTitleRegion.hpp

@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_TITLE_REGION_HPP
-#define UI_C_SIMPLE_TITLE_REGION_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_TITLE_REGION_HPP
+#define UI_SIMPLE_C_SIMPLE_TITLE_REGION_HPP
 
 #include "ui/CScriptRegion.hpp"
 

src/ui/simple/CSimpleTop.cpp

@@ -1,13 +1,13 @@
-#include "ui/CSimpleTop.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "gx/Camera.hpp"
 #include "gx/Coordinate.hpp"
 #include "gx/Device.hpp"
 #include "gx/Font.hpp"
 #include "gx/Screen.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleRender.hpp"
-#include "ui/CSimpleTexture.hpp"
-#include "ui/CSimpleTitleRegion.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleRender.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTitleRegion.hpp"
 #include <cstring>
 #include <tempest/Math.hpp>
 

src/ui/simple/CSimpleTop.hpp

@@ -1,14 +1,15 @@
-#ifndef UI_C_SIMPLE_TOP_HPP
-#define UI_C_SIMPLE_TOP_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_TOP_HPP
+#define UI_SIMPLE_C_SIMPLE_TOP_HPP
 
 #include "event/Event.hpp"
 #include "gx/Screen.hpp"
 #include "ui/CFrameStrata.hpp"
 #include "ui/CLayoutFrame.hpp"
-#include "ui/CSimpleFrame.hpp"
 #include "ui/FrameScript.hpp"
 #include <common/Array.hpp>
 
+class CSimpleFrame;
+
 enum MOVERESIZE_REASON {
     MOVERESIZE_REASON0 = 0,
     MOVERESIZE_REASON1 = 1,