Release 1.23
							parent
							
								
									a2a86136f2
								
							
						
					
					
						commit
						a6bcc82b56
					
				| 
						 | 
					@ -21,48 +21,48 @@ namespace Globals
 | 
				
			||||||
        std::int32_t Grandchild = -1;
 | 
					        std::int32_t Grandchild = -1;
 | 
				
			||||||
    } WidgetDef;
 | 
					    } WidgetDef;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    inline SettingsDef SETTING_COMBAT_SPECIAL               = { 300 };
 | 
					    const SettingsDef SETTING_COMBAT_SPECIAL               = { 300 };
 | 
				
			||||||
    inline SettingsDef SETTING_COMBAT_SPECIAL_TOGGLE        = { 301 };
 | 
					    const SettingsDef SETTING_COMBAT_SPECIAL_TOGGLE        = { 301 };
 | 
				
			||||||
    inline SettingsDef SETTING_COMBAT_AUTO_RETALIATE        = { 172 };
 | 
					    const SettingsDef SETTING_COMBAT_AUTO_RETALIATE        = { 172 };
 | 
				
			||||||
    inline SettingsDef SETTING_COMBAT_POISON                = { 102 };
 | 
					    const SettingsDef SETTING_COMBAT_POISON                = { 102 };
 | 
				
			||||||
    inline SettingsDef SETTING_WEAPON_STYLES                = { 43 }; // How many styles the current weapon has
 | 
					    const SettingsDef SETTING_WEAPON_STYLES                = { 43 }; // How many styles the current weapon has
 | 
				
			||||||
    inline SettingsDef SETTING_ACCEPT_AID                   = { 427 }; // 13 = on
 | 
					    const SettingsDef SETTING_ACCEPT_AID                   = { 427 }; // 13 = on
 | 
				
			||||||
    inline SettingsDef SETTING_RUN_MODE                     = { 173 }; // 1 = running
 | 
					    const SettingsDef SETTING_RUN_MODE                     = { 173 }; // 1 = running
 | 
				
			||||||
    inline SettingsDef SETTING_CURRENT_PRAYER               = { 83 }; // To be used with PrayerDefs
 | 
					    const SettingsDef SETTING_CURRENT_PRAYER               = { 83 }; // To be used with PrayerDefs
 | 
				
			||||||
    inline SettingsDef SETTING_BANK_WITHDRAW_MODE           = { 115, 0 };
 | 
					    const SettingsDef SETTING_BANK_WITHDRAW_MODE           = { 115, 0 };
 | 
				
			||||||
    inline SettingsDef SETTING_BANK_WITHDRAW_MODE_WIDGET    = { 1666 }; // Which Widget is selected, 0 = 1, 4 = 5, 8 = 10, 12 = X, 16 = ALL
 | 
					    const SettingsDef SETTING_BANK_WITHDRAW_MODE_WIDGET    = { 1666 }; // Which Widget is selected, 0 = 1, 4 = 5, 8 = 10, 12 = X, 16 = ALL
 | 
				
			||||||
    inline SettingsDef SETTING_BANK_DEFAULT_QUANTITY        = { 304 }; // Seems to be the value / 2, so if it returns 50, then the default custom quantity is 25
 | 
					    const SettingsDef SETTING_BANK_DEFAULT_QUANTITY        = { 304 }; // Seems to be the value / 2, so if it returns 50, then the default custom quantity is 25
 | 
				
			||||||
    inline SettingsDef SETTING_EXCHANGE_CURRENT_SLOT_INDEX          = { 375 };
 | 
					    const SettingsDef SETTING_EXCHANGE_CURRENT_SLOT_INDEX          = { 375 };
 | 
				
			||||||
    inline SettingsDef SETTING_EXCHANGE_CURRENT_SLOT_ITEM_ID        = { 1151 };
 | 
					    const SettingsDef SETTING_EXCHANGE_CURRENT_SLOT_ITEM_ID        = { 1151 };
 | 
				
			||||||
    inline SettingsDef SETTING_EXCHANGE_CURRENT_SLOT_ITEM_AMOUNT    = { 563 };
 | 
					    const SettingsDef SETTING_EXCHANGE_CURRENT_SLOT_ITEM_AMOUNT    = { 563 };
 | 
				
			||||||
    inline SettingsDef SETTING_EXCHANGE_CURRENT_SLOT_PRICE          = { 1043 };
 | 
					    const SettingsDef SETTING_EXCHANGE_CURRENT_SLOT_PRICE          = { 1043 };
 | 
				
			||||||
    inline SettingsDef SETTING_ESC_TO_CLOSE         = { 1224, 31 };
 | 
					    const SettingsDef SETTING_ESC_TO_CLOSE         = { 1224, 31 };
 | 
				
			||||||
    inline SettingsDef SETTING_SHIFT_CLICK_DROP     = { 1055, 17 };
 | 
					    const SettingsDef SETTING_SHIFT_CLICK_DROP     = { 1055, 17 };
 | 
				
			||||||
    inline SettingsDef SETTING_SCROLL_WHEEL_TO_ZOOM = { 1055, 29 };
 | 
					    const SettingsDef SETTING_SCROLL_WHEEL_TO_ZOOM = { 1055, 29 };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    inline std::int32_t WIDGET_ROOT_LOBBY                   = 165;
 | 
					    const std::int32_t WIDGET_ROOT_LOBBY                   = 165;
 | 
				
			||||||
    inline std::int32_t WIDGET_ROOT_FIXED                   = 548;
 | 
					    const std::int32_t WIDGET_ROOT_FIXED                   = 548;
 | 
				
			||||||
    inline std::int32_t WIDGET_ROOT_RESIZABLE               = 161;
 | 
					    const std::int32_t WIDGET_ROOT_RESIZABLE               = 161;
 | 
				
			||||||
    inline std::int32_t WIDGET_ROOT_RESIZABLE_SIDE_PANELS   = 164;
 | 
					    const std::int32_t WIDGET_ROOT_RESIZABLE_SIDE_PANELS   = 164;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //************ Bank.cpp ************//
 | 
					    //************ Bank.cpp ************//
 | 
				
			||||||
    inline std::int32_t BANK_ITEM_CONTAINER_ID      = 95;
 | 
					    const std::int32_t BANK_ITEM_CONTAINER_ID      = 95;
 | 
				
			||||||
    inline std::int32_t BANK_SPRITE_ID_CURRENT_TAB  = 1079;
 | 
					    const std::int32_t BANK_SPRITE_ID_CURRENT_TAB  = 1079;
 | 
				
			||||||
    inline std::int32_t BANK_PARENT                 = 12;
 | 
					    const std::int32_t BANK_PARENT                 = 12;
 | 
				
			||||||
    inline WidgetDef BANK_MAIN                      = { BANK_PARENT, 3 };
 | 
					    const WidgetDef BANK_MAIN                      = { BANK_PARENT, 3 };
 | 
				
			||||||
    inline WidgetDef BANK_CLOSE                     = { BANK_PARENT, 3, 11 };
 | 
					    const WidgetDef BANK_CLOSE                     = { BANK_PARENT, 3, 11 };
 | 
				
			||||||
    inline WidgetDef BANK_DEPOSIT_ALL               = { BANK_PARENT, 42 };
 | 
					    const WidgetDef BANK_DEPOSIT_ALL               = { BANK_PARENT, 42 };
 | 
				
			||||||
    inline WidgetDef BANK_DEPOSIT_EQUIPMENT         = { BANK_PARENT, 42 };
 | 
					    const WidgetDef BANK_DEPOSIT_EQUIPMENT         = { BANK_PARENT, 42 };
 | 
				
			||||||
    inline WidgetDef BANK_WITHDRAW_MODE_NOTED       = { BANK_PARENT, 25 };
 | 
					    const WidgetDef BANK_WITHDRAW_MODE_NOTED       = { BANK_PARENT, 25 };
 | 
				
			||||||
    inline WidgetDef BANK_WITHDRAW_MODE_ITEM        = { BANK_PARENT, 23 };
 | 
					    const WidgetDef BANK_WITHDRAW_MODE_ITEM        = { BANK_PARENT, 23 };
 | 
				
			||||||
    inline WidgetDef BANK_ITEM_CONTAINER_WIDGET     = { BANK_PARENT, 13 }; // Used for scrolling, contains all items, middle of the bank interface
 | 
					    const WidgetDef BANK_ITEM_CONTAINER_WIDGET     = { BANK_PARENT, 13 }; // Used for scrolling, contains all items, middle of the bank interface
 | 
				
			||||||
    inline WidgetDef BANK_TABS_CONTAINER            = { BANK_PARENT, 11 }; // Has all Tab children
 | 
					    const WidgetDef BANK_TABS_CONTAINER            = { BANK_PARENT, 11 }; // Has all Tab children
 | 
				
			||||||
    inline WidgetDef BANK_INVENTORY                 = { 15, 3 }; // When the bank is open, the Inventory has it's own widgets for items
 | 
					    const WidgetDef BANK_INVENTORY                 = { 15, 3 }; // When the bank is open, the Inventory has it's own widgets for items
 | 
				
			||||||
    inline std::int32_t BANK_WITHDRAW_QUANTITY_CHILDREN[5] = { 28, 30, 32, 34, 36 }; // 1, 5, 10, x, all, uses BANK_PARENT
 | 
					    const std::int32_t BANK_WITHDRAW_QUANTITY_CHILDREN[5] = { 28, 30, 32, 34, 36 }; // 1, 5, 10, x, all, uses BANK_PARENT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    inline std::int32_t BANK_ENTER_PIN_PARENT               = 213;
 | 
					    const std::int32_t BANK_ENTER_PIN_PARENT               = 213;
 | 
				
			||||||
    inline WidgetDef BANK_ENTER_PIN_STATUS                  = { BANK_ENTER_PIN_PARENT, 10 }; // Text widget, has FIRST, SECOND, THIRD, FOURTH, Submitting in it
 | 
					    const WidgetDef BANK_ENTER_PIN_STATUS                  = { BANK_ENTER_PIN_PARENT, 10 }; // Text widget, has FIRST, SECOND, THIRD, FOURTH, Submitting in it
 | 
				
			||||||
    inline std::int32_t BANK_ENTER_PIN_BUTTON_CHILDREN[10]  = { 16, 18, 20, 22, 24, 26, 28, 30, 32, 34 }; // Buttons themselves, uses BANK_ENTER_PIN_PARENT,
 | 
					    const std::int32_t BANK_ENTER_PIN_BUTTON_CHILDREN[10]  = { 16, 18, 20, 22, 24, 26, 28, 30, 32, 34 }; // Buttons themselves, uses BANK_ENTER_PIN_PARENT,
 | 
				
			||||||
    // grandchild 0 = proper widget bounds, grandchild 1 = text
 | 
					    // grandchild 0 = proper widget bounds, grandchild 1 = text
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //************ Chat.cpp ************//
 | 
					    //************ Chat.cpp ************//
 | 
				
			||||||
| 
						 | 
					@ -74,86 +74,86 @@ namespace Globals
 | 
				
			||||||
        std::int32_t ContentChild = -1;
 | 
					        std::int32_t ContentChild = -1;
 | 
				
			||||||
    } ChatWidgetDef;
 | 
					    } ChatWidgetDef;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    inline ChatWidgetDef CHAT_NPC_CHAT_WIDGETS          = { 231, 2, 3, 4 };
 | 
					    const ChatWidgetDef CHAT_NPC_CHAT_WIDGETS          = { 231, 2, 3, 4 };
 | 
				
			||||||
    inline ChatWidgetDef CHAT_PLAYER_CHAT_WIDGETS       = { 217, 2, 3, 4 };
 | 
					    const ChatWidgetDef CHAT_PLAYER_CHAT_WIDGETS       = { 217, 2, 3, 4 };
 | 
				
			||||||
    inline ChatWidgetDef CHAT_GAME_CHAT_WIDGETS         = { 193, 2, 3, 4 };
 | 
					    const ChatWidgetDef CHAT_GAME_CHAT_WIDGETS         = { 193, 2, 3, 4 };
 | 
				
			||||||
    inline ChatWidgetDef CHAT_LEVEL_UP_CHAT_WIDGETS     = { 233, 1, 2, 3 };
 | 
					    const ChatWidgetDef CHAT_LEVEL_UP_CHAT_WIDGETS     = { 233, 1, 3, 2 };
 | 
				
			||||||
    inline ChatWidgetDef CHAT_BANK_PIN_ERROR_WIDGETS    = { 229, 1, 2 };
 | 
					    const ChatWidgetDef CHAT_BANK_PIN_ERROR_WIDGETS    = { 229, 1, 2 };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    inline WidgetDef CHAT_SELECT_OPTION_CONTAINER   = { 219, 1 }; // Container for all Select Option options
 | 
					    const WidgetDef CHAT_SELECT_OPTION_CONTAINER   = { 219, 1 }; // Container for all Select Option options
 | 
				
			||||||
    inline WidgetDef CHAT_SELECT_OPTION_TITLE       = { CHAT_SELECT_OPTION_CONTAINER.Parent, CHAT_SELECT_OPTION_CONTAINER.Child, 0 };
 | 
					    const WidgetDef CHAT_SELECT_OPTION_TITLE       = { CHAT_SELECT_OPTION_CONTAINER.Parent, CHAT_SELECT_OPTION_CONTAINER.Child, 0 };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    inline WidgetDef CHAT_ENTER_AMOUNT_TITLE    = { 162, 44 };
 | 
					    const WidgetDef CHAT_ENTER_AMOUNT_TITLE    = { 162, 44 };
 | 
				
			||||||
    inline WidgetDef CHAT_ENTER_AMOUNT          = { 162, 45 }; // Input widget (* when blank)
 | 
					    const WidgetDef CHAT_ENTER_AMOUNT          = { 162, 45 }; // Input widget (* when blank)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //************ DepositBox.cpp ************//
 | 
					    //************ DepositBox.cpp ************//
 | 
				
			||||||
    inline std::int32_t DEPOSIT_BOX_PARENT          = 192;
 | 
					    const std::int32_t DEPOSIT_BOX_PARENT          = 192;
 | 
				
			||||||
    inline WidgetDef DEPOSIT_BOX_CLOSE              = { DEPOSIT_BOX_PARENT, 1, 11 };
 | 
					    const WidgetDef DEPOSIT_BOX_CLOSE              = { DEPOSIT_BOX_PARENT, 1, 11 };
 | 
				
			||||||
    inline WidgetDef DEPOSIT_BOX_DEPOSIT_ALL        = { DEPOSIT_BOX_PARENT, 4 };
 | 
					    const WidgetDef DEPOSIT_BOX_DEPOSIT_ALL        = { DEPOSIT_BOX_PARENT, 4 };
 | 
				
			||||||
    inline WidgetDef DEPOSIT_BOX_DEPOSIT_EQUIPMENT  = { DEPOSIT_BOX_PARENT, 6 };
 | 
					    const WidgetDef DEPOSIT_BOX_DEPOSIT_EQUIPMENT  = { DEPOSIT_BOX_PARENT, 6 };
 | 
				
			||||||
    inline WidgetDef DEPOSIT_BOX_DEPOSIT_LOOT       = { DEPOSIT_BOX_PARENT, 8 };
 | 
					    const WidgetDef DEPOSIT_BOX_DEPOSIT_LOOT       = { DEPOSIT_BOX_PARENT, 8 };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //************ Exchange.cpp ************//
 | 
					    //************ Exchange.cpp ************//
 | 
				
			||||||
    inline std::int32_t EXCHANGE_PARENT                 = 465;
 | 
					    const std::int32_t EXCHANGE_PARENT                 = 465;
 | 
				
			||||||
    inline WidgetDef EXCHANGE_MAIN                      = { EXCHANGE_PARENT, 0 };
 | 
					    const WidgetDef EXCHANGE_MAIN                      = { EXCHANGE_PARENT, 0 };
 | 
				
			||||||
    inline WidgetDef EXCHANGE_BACK                      = { EXCHANGE_PARENT, 4 };
 | 
					    const WidgetDef EXCHANGE_BACK                      = { EXCHANGE_PARENT, 4 };
 | 
				
			||||||
    inline WidgetDef EXCHANGE_CLOSE                     = { EXCHANGE_PARENT, 2, 11 };
 | 
					    const WidgetDef EXCHANGE_CLOSE                     = { EXCHANGE_PARENT, 2, 11 };
 | 
				
			||||||
    inline WidgetDef EXCHANGE_SPRITE_TYPE               = { EXCHANGE_PARENT, 24, 19};
 | 
					    const WidgetDef EXCHANGE_SPRITE_TYPE               = { EXCHANGE_PARENT, 24, 19};
 | 
				
			||||||
    inline WidgetDef EXCHANGE_ITEM                      = { EXCHANGE_PARENT, 24, 21 };
 | 
					    const WidgetDef EXCHANGE_ITEM                      = { EXCHANGE_PARENT, 24, 21 };
 | 
				
			||||||
    inline WidgetDef EXCHANGE_COLLECT_CONTAINER_WIDGET  = { EXCHANGE_PARENT, 6, 1 };
 | 
					    const WidgetDef EXCHANGE_COLLECT_CONTAINER_WIDGET  = { EXCHANGE_PARENT, 6, 1 };
 | 
				
			||||||
    inline WidgetDef EXCHANGE_COLLECT_SLOT_ONE          = { EXCHANGE_PARENT, 23, 2 };
 | 
					    const WidgetDef EXCHANGE_COLLECT_SLOT_ONE          = { EXCHANGE_PARENT, 23, 2 };
 | 
				
			||||||
    inline WidgetDef EXCHANGE_COLLECT_SLOT_TWO          = { EXCHANGE_PARENT, 23, 3 };
 | 
					    const WidgetDef EXCHANGE_COLLECT_SLOT_TWO          = { EXCHANGE_PARENT, 23, 3 };
 | 
				
			||||||
    inline WidgetDef EXCHANGE_AMOUNT                    = { EXCHANGE_PARENT, 24, 7 };
 | 
					    const WidgetDef EXCHANGE_AMOUNT                    = { EXCHANGE_PARENT, 24, 7 };
 | 
				
			||||||
    inline WidgetDef EXCHANGE_PRICE                     = { EXCHANGE_PARENT, 24, 12 };
 | 
					    const WidgetDef EXCHANGE_PRICE                     = { EXCHANGE_PARENT, 24, 12 };
 | 
				
			||||||
    inline WidgetDef EXCHANGE_GUIDE                     = { EXCHANGE_PARENT, 24, 11};
 | 
					    const WidgetDef EXCHANGE_GUIDE                     = { EXCHANGE_PARENT, 24, 11};
 | 
				
			||||||
    inline WidgetDef EXCHANGE_CONFIRM                   = { EXCHANGE_PARENT, 27, 0 };
 | 
					    const WidgetDef EXCHANGE_CONFIRM                   = { EXCHANGE_PARENT, 27, 0 };
 | 
				
			||||||
    inline WidgetDef EXCHANGE_ABORT                     = { EXCHANGE_PARENT, 22, 0 };
 | 
					    const WidgetDef EXCHANGE_ABORT                     = { EXCHANGE_PARENT, 22, 0 };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    inline WidgetDef EXCHANGE_CHAT                      = { 162, 44 };
 | 
					    const WidgetDef EXCHANGE_CHAT                      = { 162, 44 };
 | 
				
			||||||
    inline WidgetDef EXCHANGE_CHAT_ENTER                = { 162, 45 };
 | 
					    const WidgetDef EXCHANGE_CHAT_ENTER                = { 162, 45 };
 | 
				
			||||||
    inline WidgetDef EXCHANGE_CHAT_CHOOSE               = { 162, 53 };
 | 
					    const WidgetDef EXCHANGE_CHAT_CHOOSE               = { 162, 53 };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    inline std::int32_t EXCHANGE_SLOT_START         = 7;
 | 
					    const std::int32_t EXCHANGE_SLOT_START         = 7;
 | 
				
			||||||
    inline std::int32_t EXCHANGE_WIDGET_SPRITE_BUY  = 26; // Widget Grandchild
 | 
					    const std::int32_t EXCHANGE_WIDGET_SPRITE_BUY  = 26; // Widget Grandchild
 | 
				
			||||||
    inline std::int32_t EXCHANGE_WIDGET_SPRITE_SELL = EXCHANGE_WIDGET_SPRITE_BUY + 1; // Widget Grandchild
 | 
					    const std::int32_t EXCHANGE_WIDGET_SPRITE_SELL = EXCHANGE_WIDGET_SPRITE_BUY + 1; // Widget Grandchild
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    inline std::int32_t EXCHANGE_SPRITE_BUY         = 1108;
 | 
					    const std::int32_t EXCHANGE_SPRITE_BUY         = 1108;
 | 
				
			||||||
    inline std::int32_t EXCHANGE_SPRITE_SELL        = 1106;
 | 
					    const std::int32_t EXCHANGE_SPRITE_SELL        = 1106;
 | 
				
			||||||
    inline std::int32_t EXCHANGE_SPRITE_MINI_BUY    = 1118;
 | 
					    const std::int32_t EXCHANGE_SPRITE_MINI_BUY    = 1118;
 | 
				
			||||||
    inline std::int32_t EXCHANGE_SPRITE_MINI_SELL   = 1119;
 | 
					    const std::int32_t EXCHANGE_SPRITE_MINI_SELL   = 1119;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //************ Login.cpp ************//
 | 
					    //************ Login.cpp ************//
 | 
				
			||||||
    inline WidgetDef LOGIN_LOBBY_PLAY = { 378, 81 };
 | 
					    const WidgetDef LOGIN_LOBBY_PLAY = { 378, 81 };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //************ Makescreen.cpp ************//
 | 
					    //************ Makescreen.cpp ************//
 | 
				
			||||||
    inline std::int32_t MAKESCREEN_PARENT           = 270;
 | 
					    const std::int32_t MAKESCREEN_PARENT           = 270;
 | 
				
			||||||
    inline WidgetDef MAKESCREEN_MAKE_ONE            = { MAKESCREEN_PARENT, 7, 0 }; // 0 is for the sprite
 | 
					    const WidgetDef MAKESCREEN_MAKE_ONE            = { MAKESCREEN_PARENT, 7, 0 }; // 0 is for the sprite
 | 
				
			||||||
    inline WidgetDef MAKESCREEN_MAKE_FIVE           = { MAKESCREEN_PARENT, 8, 0 }; // 0 is for the sprite
 | 
					    const WidgetDef MAKESCREEN_MAKE_FIVE           = { MAKESCREEN_PARENT, 8, 0 }; // 0 is for the sprite
 | 
				
			||||||
    inline WidgetDef MAKESCREEN_MAKE_TEN            = { MAKESCREEN_PARENT, 9, 0 }; // 0 is for the sprite
 | 
					    const WidgetDef MAKESCREEN_MAKE_TEN            = { MAKESCREEN_PARENT, 9, 0 }; // 0 is for the sprite
 | 
				
			||||||
    inline WidgetDef MAKESCREEN_MAKE_CUSTOM         = { MAKESCREEN_PARENT, 10, 0 }; // 0 is for the sprite
 | 
					    const WidgetDef MAKESCREEN_MAKE_CUSTOM         = { MAKESCREEN_PARENT, 10, 0 }; // 0 is for the sprite
 | 
				
			||||||
    inline WidgetDef MAKESCREEN_MAKE_CUSTOM_TEXT    = { MAKESCREEN_PARENT, 10, 9 };
 | 
					    const WidgetDef MAKESCREEN_MAKE_CUSTOM_TEXT    = { MAKESCREEN_PARENT, 10, 9 };
 | 
				
			||||||
    inline WidgetDef MAKESCREEN_MAKE_X              = { MAKESCREEN_PARENT, 11 };
 | 
					    const WidgetDef MAKESCREEN_MAKE_X              = { MAKESCREEN_PARENT, 11 };
 | 
				
			||||||
    inline WidgetDef MAKESCREEN_MAKE_ALL            = { MAKESCREEN_PARENT, 12, 0 }; // 0 is for the sprite
 | 
					    const WidgetDef MAKESCREEN_MAKE_ALL            = { MAKESCREEN_PARENT, 12, 0 }; // 0 is for the sprite
 | 
				
			||||||
    inline WidgetDef MAKESCREEN_MAKE_MIDDLE         = { MAKESCREEN_PARENT, 14 };
 | 
					    const WidgetDef MAKESCREEN_MAKE_MIDDLE         = { MAKESCREEN_PARENT, 14 };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //************ Minimap.cpp ************//
 | 
					    //************ Minimap.cpp ************//
 | 
				
			||||||
    // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels
 | 
					    // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels
 | 
				
			||||||
    inline WidgetDef MINIMAP_MIDDLE[3]      = { { 548, 8 }, { 161, 25 }, { 164, 25 } };
 | 
					    const WidgetDef MINIMAP_MIDDLE[3]      = { { 548, 8 }, { 161, 25 }, { 164, 25 } };
 | 
				
			||||||
    inline WidgetDef MINIMAP_COMPASS[3]     = { { 548, 7 }, { 161, 24 }, { 164, 24 } };
 | 
					    const WidgetDef MINIMAP_COMPASS[3]     = { { 548, 7 }, { 161, 24 }, { 164, 24 } };
 | 
				
			||||||
    inline WidgetDef MINIMAP_CURE           = { 160, 4 };
 | 
					    const WidgetDef MINIMAP_CURE           = { 160, 4 };
 | 
				
			||||||
    inline WidgetDef MINIMAP_QUICK_PRAYER   = { 160, 14 };
 | 
					    const WidgetDef MINIMAP_QUICK_PRAYER   = { 160, 14 };
 | 
				
			||||||
    inline WidgetDef MINIMAP_TOGGLE_RUN     = { 160, 22 };
 | 
					    const WidgetDef MINIMAP_TOGGLE_RUN     = { 160, 22 };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //************ Trade.cpp ************//
 | 
					    //************ Trade.cpp ************//
 | 
				
			||||||
    inline WidgetDef TRADE_SCREEN                           = { 335, 3 };
 | 
					    const WidgetDef TRADE_SCREEN                           = { 335, 3 };
 | 
				
			||||||
    inline std::int32_t TRADE_ITEM_CONTAINER_MY_OFFER       = 90;
 | 
					    const std::int32_t TRADE_ITEM_CONTAINER_MY_OFFER       = 90;
 | 
				
			||||||
    inline std::int32_t TRADE_ITEM_CONTAINER_THEIR_OFFER    = 32858;
 | 
					    const std::int32_t TRADE_ITEM_CONTAINER_THEIR_OFFER    = 32858;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //************ Item.cpp ************//
 | 
					    //************ Item.cpp ************//
 | 
				
			||||||
    inline std::int32_t EQUIPMENT_ITEM_CONTAINER_WIDGET = 387; // Item container parent, (Index + 6)
 | 
					    const std::int32_t EQUIPMENT_ITEM_CONTAINER_WIDGET = 387; // Item container parent, (Index + 6)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //************ RandomHandler.cpp ************//
 | 
					    //************ RandomHandler.cpp ************//
 | 
				
			||||||
    inline std::vector<std::string> RANDOM_NPC_NAMES =
 | 
					    const std::vector<std::string> RANDOM_NPC_NAMES =
 | 
				
			||||||
    {   "Bee keeper",
 | 
					    {   "Bee keeper",
 | 
				
			||||||
        "Capt' Arnav",
 | 
					        "Capt' Arnav",
 | 
				
			||||||
        "Niles",
 | 
					        "Niles",
 | 
				
			||||||
| 
						 | 
					@ -191,48 +191,48 @@ namespace Globals
 | 
				
			||||||
        //************************************ Tabs ************************************//
 | 
					        //************************************ Tabs ************************************//
 | 
				
			||||||
        // These are the "Sprite" widgets, these widgets' sprite IDs change when opened or closed
 | 
					        // These are the "Sprite" widgets, these widgets' sprite IDs change when opened or closed
 | 
				
			||||||
        // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels
 | 
					        // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels
 | 
				
			||||||
        inline WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { 548, 32 }, { 161, 36 }, { 164, 36 } };
 | 
					        const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { 548, 32 }, { 161, 36 }, { 164, 36 } };
 | 
				
			||||||
        inline WidgetDef TAB_CLAN[3]               = { { 548, 31 }, { 161, 35 }, { 164, 35 } };
 | 
					        const WidgetDef TAB_CLAN[3]               = { { 548, 31 }, { 161, 35 }, { 164, 35 } };
 | 
				
			||||||
        inline WidgetDef TAB_COMBAT[3]             = { { 548, 48 }, { 161, 51 }, { 164, 50 } };
 | 
					        const WidgetDef TAB_COMBAT[3]             = { { 548, 48 }, { 161, 51 }, { 164, 50 } };
 | 
				
			||||||
        inline WidgetDef TAB_EMOTES[3]             = { { 548, 36 }, { 161, 40 }, { 164, 39 } };
 | 
					        const WidgetDef TAB_EMOTES[3]             = { { 548, 36 }, { 161, 40 }, { 164, 39 } };
 | 
				
			||||||
        inline WidgetDef TAB_EQUIPMENT[3]          = { { 548, 52 }, { 161, 55 }, { 164, 54 } };
 | 
					        const WidgetDef TAB_EQUIPMENT[3]          = { { 548, 52 }, { 161, 55 }, { 164, 54 } };
 | 
				
			||||||
        inline WidgetDef TAB_FRIENDS[3]            = { { 548, 33 }, { 161, 37 }, { 164, 37 } };
 | 
					        const WidgetDef TAB_FRIENDS[3]            = { { 548, 33 }, { 161, 37 }, { 164, 37 } };
 | 
				
			||||||
        inline WidgetDef TAB_INVENTORY[3]          = { { 548, 51 }, { 161, 54 }, { 164, 53 } };
 | 
					        const WidgetDef TAB_INVENTORY[3]          = { { 548, 51 }, { 161, 54 }, { 164, 53 } };
 | 
				
			||||||
        inline WidgetDef TAB_LOGOUT[3]             = { { 548, 34 }, { 161, 38 }, { 164, 29 } };
 | 
					        const WidgetDef TAB_LOGOUT[3]             = { { 548, 34 }, { 161, 38 }, { 164, 29 } };
 | 
				
			||||||
        inline WidgetDef TAB_MAGIC[3]              = { { 548, 54 }, { 161, 57 }, { 164, 56 } };
 | 
					        const WidgetDef TAB_MAGIC[3]              = { { 548, 54 }, { 161, 57 }, { 164, 56 } };
 | 
				
			||||||
        inline WidgetDef TAB_MUSIC[3]              = { { 548, 37 }, { 161, 41 }, { 164, 40 } };
 | 
					        const WidgetDef TAB_MUSIC[3]              = { { 548, 37 }, { 161, 41 }, { 164, 40 } };
 | 
				
			||||||
        inline WidgetDef TAB_OPTIONS[3]            = { { 548, 35 }, { 161, 39 }, { 164, 38 } };
 | 
					        const WidgetDef TAB_OPTIONS[3]            = { { 548, 35 }, { 161, 39 }, { 164, 38 } };
 | 
				
			||||||
        inline WidgetDef TAB_PRAYER[3]             = { { 548, 53 }, { 161, 56 }, { 164, 55 } };
 | 
					        const WidgetDef TAB_PRAYER[3]             = { { 548, 53 }, { 161, 56 }, { 164, 55 } };
 | 
				
			||||||
        inline WidgetDef TAB_QUESTS[3]             = { { 548, 50 }, { 161, 53 }, { 164, 52 } };
 | 
					        const WidgetDef TAB_QUESTS[3]             = { { 548, 50 }, { 161, 53 }, { 164, 52 } };
 | 
				
			||||||
        inline WidgetDef TAB_STATS[3]              = { { 548, 49 }, { 161, 52 }, { 164, 51 } };
 | 
					        const WidgetDef TAB_STATS[3]              = { { 548, 49 }, { 161, 52 }, { 164, 51 } };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //************ Combat.cpp ************//
 | 
					        //************ Combat.cpp ************//
 | 
				
			||||||
        inline std::int32_t COMBAT_PARENT              = 593 ;
 | 
					        const std::int32_t COMBAT_PARENT              = 593 ;
 | 
				
			||||||
        inline WidgetDef COMBAT_AUTORETALIATE          = { COMBAT_PARENT, 29 };
 | 
					        const WidgetDef COMBAT_AUTORETALIATE          = { COMBAT_PARENT, 29 };
 | 
				
			||||||
        inline WidgetDef COMBAT_SPECIAL                = { COMBAT_PARENT, 34 };
 | 
					        const WidgetDef COMBAT_SPECIAL                = { COMBAT_PARENT, 34 };
 | 
				
			||||||
        inline std::int32_t COMBAT_STYLE_CHILDREN[4]   = { 3, 7, 11, 15 }; // Uses COMBAT_PARENT as Parent
 | 
					        const std::int32_t COMBAT_STYLE_CHILDREN[4]   = { 3, 7, 11, 15 }; // Uses COMBAT_PARENT as Parent
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //************ Equipment.cpp ************//
 | 
					        //************ Equipment.cpp ************//
 | 
				
			||||||
        inline std::int32_t EQUIPMENT_CONTAINER_ID = 94;
 | 
					        const std::int32_t EQUIPMENT_CONTAINER_ID = 94;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //************ Inventory.cpp ************//
 | 
					        //************ Inventory.cpp ************//
 | 
				
			||||||
        inline WidgetDef INVENTORY_ITEM_CONTAINER_WIDGET       = { 149, 0 };
 | 
					        const WidgetDef INVENTORY_ITEM_CONTAINER_WIDGET       = { 149, 0 };
 | 
				
			||||||
        inline WidgetDef INVENTORY_TRADE_CONTAINER_WIDGET      = { 336, 0 }; // Used for GetSlotBoxes()
 | 
					        const WidgetDef INVENTORY_TRADE_CONTAINER_WIDGET      = { 336, 0 }; // Used for GetSlotBoxes()
 | 
				
			||||||
        inline WidgetDef INVENTORY_EXCHANGE_CONTAINER_WIDGET   = { 467, 0 }; // Used for GetSlotBoxes()
 | 
					        const WidgetDef INVENTORY_EXCHANGE_CONTAINER_WIDGET   = { 467, 0 }; // Used for GetSlotBoxes()
 | 
				
			||||||
        inline std::int32_t INVENTORY_CONTAINER_ID = 93;
 | 
					        const std::int32_t INVENTORY_CONTAINER_ID = 93;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //************ Logout.cpp ************//
 | 
					        //************ Logout.cpp ************//
 | 
				
			||||||
        inline std::int32_t LOGOUT_BUTTONS_PARENT       = 182;
 | 
					        const std::int32_t LOGOUT_BUTTONS_PARENT       = 182;
 | 
				
			||||||
        inline WidgetDef LOGOUT_LOGOUT_BUTTON           = { LOGOUT_BUTTONS_PARENT, 8 };
 | 
					        const WidgetDef LOGOUT_LOGOUT_BUTTON           = { LOGOUT_BUTTONS_PARENT, 8 };
 | 
				
			||||||
        inline WidgetDef LOGOUT_WORLD_SWITCHER_BUTTON   = { LOGOUT_BUTTONS_PARENT, 3 };
 | 
					        const WidgetDef LOGOUT_WORLD_SWITCHER_BUTTON   = { LOGOUT_BUTTONS_PARENT, 3 };
 | 
				
			||||||
        inline std::int32_t LOGOUT_WORLD_SWITCHER_PARENT            = 69;
 | 
					        const std::int32_t LOGOUT_WORLD_SWITCHER_PARENT            = 69;
 | 
				
			||||||
        inline WidgetDef LOGOUT_WORLD_SWITCHER_TITLE                = { LOGOUT_WORLD_SWITCHER_PARENT, 2 }; // "Current World:" or "Loading" when loading
 | 
					        const WidgetDef LOGOUT_WORLD_SWITCHER_TITLE                = { LOGOUT_WORLD_SWITCHER_PARENT, 2 }; // "Current World:" or "Loading" when loading
 | 
				
			||||||
        inline WidgetDef LOGOUT_WORLD_SWITCHER_LOGOUT               = { LOGOUT_WORLD_SWITCHER_PARENT, 23 }; // Logout button inside the World Switch interface
 | 
					        const WidgetDef LOGOUT_WORLD_SWITCHER_LOGOUT               = { LOGOUT_WORLD_SWITCHER_PARENT, 23 }; // Logout button inside the World Switch interface
 | 
				
			||||||
        inline WidgetDef LOGOUT_WORLD_SWITCHER_WORLDS_CONTAINER     = { LOGOUT_WORLD_SWITCHER_PARENT, 16 }; // 69, 15, 301 (world id) Widget has the proper switch/favorite options
 | 
					        const WidgetDef LOGOUT_WORLD_SWITCHER_WORLDS_CONTAINER     = { LOGOUT_WORLD_SWITCHER_PARENT, 16 }; // 69, 15, 301 (world id) Widget has the proper switch/favorite options
 | 
				
			||||||
        inline WidgetDef LOGOUT_WORLD_SWITCHER_WORLDS_BOX           = { LOGOUT_WORLD_SWITCHER_PARENT, 5 }; // Bounds/Box containing the entire list
 | 
					        const WidgetDef LOGOUT_WORLD_SWITCHER_WORLDS_BOX           = { LOGOUT_WORLD_SWITCHER_PARENT, 5 }; // Bounds/Box containing the entire list
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //************ Magic.cpp ************//
 | 
					        //************ Magic.cpp ************//
 | 
				
			||||||
        inline std::int32_t MAGIC_SPELLS_PARENT = 218; // Used with Magic spell defs
 | 
					        const std::int32_t MAGIC_SPELLS_PARENT = 218; // Used with Magic spell defs
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        typedef struct SpellDef
 | 
					        typedef struct SpellDef
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
| 
						 | 
					@ -242,7 +242,7 @@ namespace Globals
 | 
				
			||||||
            std::int32_t Level;
 | 
					            std::int32_t Level;
 | 
				
			||||||
        } SpellDef;
 | 
					        } SpellDef;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        inline std::vector<SpellDef> SpellDefs = // To be used with Magic:: SPELL enum
 | 
					        const std::vector<SpellDef> SpellDefs = // To be used with Magic:: SPELL enum
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            // Normal, 0-69
 | 
					            // Normal, 0-69
 | 
				
			||||||
            { "Lumbridge Home Teleport", 4, 356, 0 },
 | 
					            { "Lumbridge Home Teleport", 4, 356, 0 },
 | 
				
			||||||
| 
						 | 
					@ -391,13 +391,12 @@ namespace Globals
 | 
				
			||||||
        };
 | 
					        };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //************ Options.cpp ************//
 | 
					        //************ Options.cpp ************//
 | 
				
			||||||
        inline std::int32_t OPTIONS_PARENT  = 261;
 | 
					        const std::int32_t OPTIONS_PARENT  = 261;
 | 
				
			||||||
        inline WidgetDef OPTIONS_ACCEPT_AID = { OPTIONS_PARENT, 92 };
 | 
					        const WidgetDef OPTIONS_ACCEPT_AID = { OPTIONS_PARENT, 92 };
 | 
				
			||||||
        inline WidgetDef OPTIONS_RUN_MODE   = { OPTIONS_PARENT, 95 };
 | 
					        const WidgetDef OPTIONS_RUN_MODE   = { OPTIONS_PARENT, 95 };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //************ Prayer.cpp ************//
 | 
					        //************ Prayer.cpp ************//
 | 
				
			||||||
        inline std::int32_t PRAYER_PRAYERS_PARENT = 541; // To be used with PrayerDefs
 | 
					        const std::int32_t PRAYER_PRAYERS_PARENT = 541; // To be used with PrayerDefs
 | 
				
			||||||
        
 | 
					 | 
				
			||||||
        typedef struct PrayerDef
 | 
					        typedef struct PrayerDef
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            std::string Name;
 | 
					            std::string Name;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -109,7 +109,7 @@ namespace Bank
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    PIN_STEP GetEnterPinStep();
 | 
					    PIN_STEP GetEnterPinStep();
 | 
				
			||||||
    bool IsEnterPinOpen();
 | 
					    bool IsEnterPinOpen();
 | 
				
			||||||
    bool EnterPin(bool Terminate = true);
 | 
					    bool EnterPin(bool TerminateOnError = true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    std::int32_t GetDefaultWithdrawQuantity();
 | 
					    std::int32_t GetDefaultWithdrawQuantity();
 | 
				
			||||||
    bool SetDefaultWithdrawQuantity(std::int32_t Amount);
 | 
					    bool SetDefaultWithdrawQuantity(std::int32_t Amount);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							
		Loading…
	
		Reference in New Issue