diff --git a/Include/Game/Globals.hpp b/Include/Game/Globals.hpp index d97b9a7..80799e0 100644 --- a/Include/Game/Globals.hpp +++ b/Include/Game/Globals.hpp @@ -152,12 +152,12 @@ namespace Globals //************ Minimap.cpp ************// // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels - const WidgetDef MINIMAP_MIDDLE[3] = { { 548, 8 }, { 161, 28 }, { 164, 28 } }; - const WidgetDef MINIMAP_COMPASS[3] = { { 548, 7 }, { 161, 26 }, { 164, 26 } }; - const WidgetDef MINIMAP_CURE = { 160, 6 }; - const WidgetDef MINIMAP_QUICK_PRAYER = { 160, 14 }; - const WidgetDef MINIMAP_TOGGLE_RUN = { 160, 22 }; - const WidgetDef MINIMAP_SPECIAL_ATTACK = { 160, 28 }; + const WidgetDef MINIMAP_MIDDLE[3] = { { WIDGET_ROOT_FIXED, 8 }, { WIDGET_ROOT_RESIZABLE, 33 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 33 } }; + const WidgetDef MINIMAP_COMPASS[3] = { { WIDGET_ROOT_FIXED, 7 }, { WIDGET_ROOT_RESIZABLE, 32 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 32 } }; + const WidgetDef MINIMAP_CURE = { 160, 12 }; + const WidgetDef MINIMAP_QUICK_PRAYER = { 160, 20 }; + const WidgetDef MINIMAP_TOGGLE_RUN = { 160, 28 }; + const WidgetDef MINIMAP_SPECIAL_ATTACK = { 160, 37 }; //************ Trade.cpp ************// const WidgetDef TRADE_SCREEN = { 335, 3 }; @@ -207,21 +207,22 @@ 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, 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, 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 } }; + const WidgetDef TAB_CLAN[3] = { { WIDGET_ROOT_FIXED, 39 }, { WIDGET_ROOT_RESIZABLE, 45 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 43 } }; + const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { WIDGET_ROOT_FIXED, 40 }, { WIDGET_ROOT_RESIZABLE, 46 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 44 } }; + const WidgetDef TAB_IGNORES[3] = { { WIDGET_ROOT_FIXED, 41 }, { WIDGET_ROOT_RESIZABLE, 47 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 45 } }; + const WidgetDef TAB_FRIENDS[3] = { { WIDGET_ROOT_FIXED, 41 }, { WIDGET_ROOT_RESIZABLE, 47 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 45 } }; + const WidgetDef TAB_LOGOUT[3] = { { WIDGET_ROOT_FIXED, 42 }, { WIDGET_ROOT_RESIZABLE, 48 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 37 } }; + const WidgetDef TAB_OPTIONS[3] = { { WIDGET_ROOT_FIXED, 43 }, { WIDGET_ROOT_RESIZABLE, 49 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 46 } }; + const WidgetDef TAB_EMOTES[3] = { { WIDGET_ROOT_FIXED, 44 }, { WIDGET_ROOT_RESIZABLE, 50 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 47 } }; + const WidgetDef TAB_MUSIC[3] = { { WIDGET_ROOT_FIXED, 45 }, { WIDGET_ROOT_RESIZABLE, 51 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 48 } }; + const WidgetDef TAB_COMBAT[3] = { { WIDGET_ROOT_FIXED, 56 }, { WIDGET_ROOT_RESIZABLE, 61 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 58 } }; + const WidgetDef TAB_STATS[3] = { { WIDGET_ROOT_FIXED, 57 }, { WIDGET_ROOT_RESIZABLE, 62 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 59 } }; + const WidgetDef TAB_QUESTS[3] = { { WIDGET_ROOT_FIXED, 58 }, { WIDGET_ROOT_RESIZABLE, 63 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 60 } }; + const WidgetDef TAB_INVENTORY[3] = { { WIDGET_ROOT_FIXED, 59 }, { WIDGET_ROOT_RESIZABLE, 64 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 61 } }; + const WidgetDef TAB_EQUIPMENT[3] = { { WIDGET_ROOT_FIXED, 60 }, { WIDGET_ROOT_RESIZABLE, 65 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 62 } }; + const WidgetDef TAB_PRAYER[3] = { { WIDGET_ROOT_FIXED, 61 }, { WIDGET_ROOT_RESIZABLE, 66 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 63 } }; + const WidgetDef TAB_MAGIC[3] = { { WIDGET_ROOT_FIXED, 62 }, { WIDGET_ROOT_RESIZABLE, 67 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 64 } }; //************ Combat.cpp ************// diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 5aeec97..075e163 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ