diff --git a/Include/Game/Globals.hpp b/Include/Game/Globals.hpp index 19eea04..df097ae 100644 --- a/Include/Game/Globals.hpp +++ b/Include/Game/Globals.hpp @@ -154,8 +154,8 @@ namespace Globals //************ Minimap.cpp ************// // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels - const WidgetDef MINIMAP_MIDDLE[3] = { { WIDGET_ROOT_FIXED, 21 }, { WIDGET_ROOT_RESIZABLE, 29 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 29 } }; - const WidgetDef MINIMAP_COMPASS[3] = { { WIDGET_ROOT_FIXED, 23 }, { WIDGET_ROOT_RESIZABLE, 28 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 28 } }; + const WidgetDef MINIMAP_MIDDLE[3] = { { WIDGET_ROOT_FIXED, 21 }, { WIDGET_ROOT_RESIZABLE, 30 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 30 } }; + const WidgetDef MINIMAP_COMPASS[3] = { { WIDGET_ROOT_FIXED, 23 }, { WIDGET_ROOT_RESIZABLE, 29 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 29 } }; const WidgetDef MINIMAP_CURE = { 160, 8 }; const WidgetDef MINIMAP_QUICK_PRAYER = { 160, 19 }; const WidgetDef MINIMAP_TOGGLE_RUN = { 160, 27 }; @@ -209,22 +209,22 @@ namespace Globals // These are the "Sprite" widgets, these widgets' sprite IDs change when opened or closed (usually the lower number) // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels - const WidgetDef TAB_CLAN[3] = { { WIDGET_ROOT_FIXED, 46 }, { WIDGET_ROOT_RESIZABLE, 42 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 37 } }; - const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { WIDGET_ROOT_FIXED, 47 }, { WIDGET_ROOT_RESIZABLE, 43 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 38 } }; - const WidgetDef TAB_IGNORES[3] = { { WIDGET_ROOT_FIXED, 48 }, { WIDGET_ROOT_RESIZABLE, 44 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 39 } }; - const WidgetDef TAB_FRIENDS[3] = { { WIDGET_ROOT_FIXED, 48 }, { WIDGET_ROOT_RESIZABLE, 44 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 39 } }; - const WidgetDef TAB_LOGOUT[3] = { { WIDGET_ROOT_FIXED, 49 }, { WIDGET_ROOT_RESIZABLE, 45 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 33 } }; - const WidgetDef TAB_OPTIONS[3] = { { WIDGET_ROOT_FIXED, 50 }, { WIDGET_ROOT_RESIZABLE, 46 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 40 } }; - const WidgetDef TAB_EMOTES[3] = { { WIDGET_ROOT_FIXED, 51 }, { WIDGET_ROOT_RESIZABLE, 47 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 41 } }; - const WidgetDef TAB_MUSIC[3] = { { WIDGET_ROOT_FIXED, 52 }, { WIDGET_ROOT_RESIZABLE, 48 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 42 } }; + const WidgetDef TAB_CLAN[3] = { { WIDGET_ROOT_FIXED, 47 }, { WIDGET_ROOT_RESIZABLE, 43 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 38 } }; + const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { WIDGET_ROOT_FIXED, 48 }, { WIDGET_ROOT_RESIZABLE, 44 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 39 } }; + const WidgetDef TAB_IGNORES[3] = { { WIDGET_ROOT_FIXED, 49 }, { WIDGET_ROOT_RESIZABLE, 45 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 40 } }; + const WidgetDef TAB_FRIENDS[3] = { { WIDGET_ROOT_FIXED, 49 }, { WIDGET_ROOT_RESIZABLE, 45 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 40 } }; + const WidgetDef TAB_LOGOUT[3] = { { WIDGET_ROOT_FIXED, 50 }, { WIDGET_ROOT_RESIZABLE, 46 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 34 } }; + const WidgetDef TAB_OPTIONS[3] = { { WIDGET_ROOT_FIXED, 51 }, { WIDGET_ROOT_RESIZABLE, 47 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 41 } }; + const WidgetDef TAB_EMOTES[3] = { { WIDGET_ROOT_FIXED, 52 }, { WIDGET_ROOT_RESIZABLE, 48 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 42 } }; + const WidgetDef TAB_MUSIC[3] = { { WIDGET_ROOT_FIXED, 53 }, { WIDGET_ROOT_RESIZABLE, 49 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 43 } }; - const WidgetDef TAB_COMBAT[3] = { { WIDGET_ROOT_FIXED, 62 }, { WIDGET_ROOT_RESIZABLE, 58 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 51 } }; - const WidgetDef TAB_STATS[3] = { { WIDGET_ROOT_FIXED, 63 }, { WIDGET_ROOT_RESIZABLE, 59 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 52 } }; - const WidgetDef TAB_QUESTS[3] = { { WIDGET_ROOT_FIXED, 64 }, { WIDGET_ROOT_RESIZABLE, 60 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 53 } }; - const WidgetDef TAB_INVENTORY[3] = { { WIDGET_ROOT_FIXED, 65 }, { WIDGET_ROOT_RESIZABLE, 61 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 54 } }; - const WidgetDef TAB_EQUIPMENT[3] = { { WIDGET_ROOT_FIXED, 66 }, { WIDGET_ROOT_RESIZABLE, 62 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 55 } }; - const WidgetDef TAB_PRAYER[3] = { { WIDGET_ROOT_FIXED, 67 }, { WIDGET_ROOT_RESIZABLE, 63 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 56 } }; - const WidgetDef TAB_MAGIC[3] = { { WIDGET_ROOT_FIXED, 68 }, { WIDGET_ROOT_RESIZABLE, 64 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 57 } }; + const WidgetDef TAB_COMBAT[3] = { { WIDGET_ROOT_FIXED, 63 }, { WIDGET_ROOT_RESIZABLE, 59 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 52 } }; + const WidgetDef TAB_STATS[3] = { { WIDGET_ROOT_FIXED, 64 }, { WIDGET_ROOT_RESIZABLE, 60 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 53 } }; + const WidgetDef TAB_QUESTS[3] = { { WIDGET_ROOT_FIXED, 65 }, { WIDGET_ROOT_RESIZABLE, 61 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 54 } }; + const WidgetDef TAB_INVENTORY[3] = { { WIDGET_ROOT_FIXED, 66 }, { WIDGET_ROOT_RESIZABLE, 62 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 55 } }; + const WidgetDef TAB_EQUIPMENT[3] = { { WIDGET_ROOT_FIXED, 67 }, { WIDGET_ROOT_RESIZABLE, 63 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 56 } }; + const WidgetDef TAB_PRAYER[3] = { { WIDGET_ROOT_FIXED, 68 }, { WIDGET_ROOT_RESIZABLE, 64 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 57 } }; + const WidgetDef TAB_MAGIC[3] = { { WIDGET_ROOT_FIXED, 69 }, { WIDGET_ROOT_RESIZABLE, 65 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 58 } }; //************ Combat.cpp ************// diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index cb4f35d..fac476a 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ