diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index add1fc7..4d7a9c1 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -7,7 +7,6 @@ #include "Paint.hpp" #include "Script.hpp" #include "Time.hpp" -#include "Globals.hpp" #include "Types/Tile.hpp" #include "Types/Point.hpp" diff --git a/Include/Core/Globals.hpp b/Include/Game/Globals.hpp similarity index 98% rename from Include/Core/Globals.hpp rename to Include/Game/Globals.hpp index 39a0253..bca0762 100644 --- a/Include/Core/Globals.hpp +++ b/Include/Game/Globals.hpp @@ -207,21 +207,21 @@ namespace Globals // These are the "Sprite" widgets, these widgets' sprite IDs change when opened or closed // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels - const WidgetDef TAB_COMBAT[3] = { { 548, 51 }, { 161, 54 }, { 164, 53 } }; - const WidgetDef TAB_STATS[3] = { { 548, 52 }, { 161, 55 }, { 164, 54 } }; - const WidgetDef TAB_QUESTS[3] = { { 548, 53 }, { 161, 56 }, { 164, 55 } }; - const WidgetDef TAB_INVENTORY[3] = { { 548, 54 }, { 161, 57 }, { 164, 56 } }; - const WidgetDef TAB_EQUIPMENT[3] = { { 548, 55 }, { 161, 58 }, { 164, 57 } }; - const WidgetDef TAB_PRAYER[3] = { { 548, 56 }, { 161, 59 }, { 164, 58 } }; - const WidgetDef TAB_MAGIC[3] = { { 548, 57 }, { 161, 60 }, { 164, 59 } }; + const WidgetDef TAB_COMBAT[3] = { { 548, 51 }, { 161, 55 }, { 164, 53 } }; + const WidgetDef TAB_STATS[3] = { { 548, 52 }, { 161, 56 }, { 164, 54 } }; + const WidgetDef TAB_QUESTS[3] = { { 548, 53 }, { 161, 57 }, { 164, 55 } }; + const WidgetDef TAB_INVENTORY[3] = { { 548, 54 }, { 161, 58 }, { 164, 56 } }; + const WidgetDef TAB_EQUIPMENT[3] = { { 548, 55 }, { 161, 59 }, { 164, 57 } }; + const WidgetDef TAB_PRAYER[3] = { { 548, 56 }, { 161, 60 }, { 164, 58 } }; + const WidgetDef TAB_MAGIC[3] = { { 548, 57 }, { 161, 61 }, { 164, 59 } }; - const WidgetDef TAB_CLAN[3] = { { 548, 34 }, { 161, 38 }, { 164, 38 } }; - const WidgetDef TAB_FRIENDS[3] = { { 548, 36 }, { 161, 40 }, { 164, 40 } }; - const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { 548, 35 }, { 161, 39 }, { 164, 39 } }; - const WidgetDef TAB_LOGOUT[3] = { { 548, 37 }, { 161, 41 }, { 164, 32 } }; - const WidgetDef TAB_OPTIONS[3] = { { 548, 38 }, { 161, 42 }, { 164, 41 } }; - const WidgetDef TAB_EMOTES[3] = { { 548, 39 }, { 161, 43 }, { 164, 42 } }; - const WidgetDef TAB_MUSIC[3] = { { 548, 40 }, { 161, 44 }, { 164, 43 } }; + const WidgetDef TAB_CLAN[3] = { { 548, 34 }, { 161, 39 }, { 164, 38 } }; + const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { 548, 35 }, { 161, 40 }, { 164, 39 } }; + const WidgetDef TAB_FRIENDS[3] = { { 548, 36 }, { 161, 41 }, { 164, 40 } }; + const WidgetDef TAB_LOGOUT[3] = { { 548, 37 }, { 161, 42 }, { 164, 32 } }; + const WidgetDef TAB_OPTIONS[3] = { { 548, 38 }, { 161, 43 }, { 164, 41 } }; + const WidgetDef TAB_EMOTES[3] = { { 548, 39 }, { 161, 44 }, { 164, 42 } }; + const WidgetDef TAB_MUSIC[3] = { { 548, 40 }, { 161, 45 }, { 164, 43 } }; //************ Combat.cpp ************// diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 094c68a..9cc3fe6 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ