diff --git a/Include/Core/Debug.hpp b/Include/Core/Debug.hpp index ac66548..6dacd47 100644 --- a/Include/Core/Debug.hpp +++ b/Include/Core/Debug.hpp @@ -34,7 +34,8 @@ namespace Debug void Clear(); void Screenshot(const std::string& Path); -}; + void SetSleepMultiplier(std::int32_t Multiplier); +} #endif // DEBUG_HPP_INCLUDED diff --git a/Include/Core/Paint.hpp b/Include/Core/Paint.hpp index daee84a..d8633be 100644 --- a/Include/Core/Paint.hpp +++ b/Include/Core/Paint.hpp @@ -33,7 +33,7 @@ namespace Paint void DrawString(const std::string& String, const Point& P, std::uint8_t Red, std::uint8_t Green, std::uint8_t Blue, std::uint8_t Alpha); void DrawPixels(const std::vector Pixels, std::uint32_t Width, std::uint32_t Height, const Point& P); void SwapBuffer(); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/Bank.hpp b/Include/Game/Interfaces/Bank.hpp index a8ebda4..fe796d3 100644 --- a/Include/Game/Interfaces/Bank.hpp +++ b/Include/Game/Interfaces/Bank.hpp @@ -113,7 +113,7 @@ namespace Bank std::int32_t GetDefaultWithdrawQuantity(); bool SetDefaultWithdrawQuantity(std::int32_t Amount); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/Chat.hpp b/Include/Game/Interfaces/Chat.hpp index 2f75999..034628f 100644 --- a/Include/Game/Interfaces/Chat.hpp +++ b/Include/Game/Interfaces/Chat.hpp @@ -68,7 +68,7 @@ namespace Chat bool SelectDialogueOption(const std::vector& Options, bool UseKeyboard = false); bool WaitDialogueState(std::uint32_t Duration, std::uint32_t Step, Chat::DIALOGUE_STATE State, bool Result = true); // Waits until the current chat state equals State -}; +} /** @} */ diff --git a/Include/Game/Interfaces/DepositBox.hpp b/Include/Game/Interfaces/DepositBox.hpp index cbe2c71..c2a3352 100644 --- a/Include/Game/Interfaces/DepositBox.hpp +++ b/Include/Game/Interfaces/DepositBox.hpp @@ -11,7 +11,7 @@ namespace DepositBox bool DepositAll(); bool DepositEquipment(); bool DepositLoot(); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/Exchange.hpp b/Include/Game/Interfaces/Exchange.hpp index 1dafe40..993ee43 100644 --- a/Include/Game/Interfaces/Exchange.hpp +++ b/Include/Game/Interfaces/Exchange.hpp @@ -110,7 +110,7 @@ namespace Exchange bool AbortOffer(const Exchange::SLOT Slot = -1); bool OpenOffer(const Exchange::SLOT Slot); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/AccountManagement.hpp b/Include/Game/Interfaces/GameTabs/AccountManagement.hpp index 2529826..1c9c45f 100644 --- a/Include/Game/Interfaces/GameTabs/AccountManagement.hpp +++ b/Include/Game/Interfaces/GameTabs/AccountManagement.hpp @@ -3,12 +3,11 @@ /** @addtogroup GameTabs * @{ */ -class AccountManagement +namespace AccountManagement { - public: - static bool IsOpen(); - static bool Open(); -}; + bool IsOpen(); + bool Open(); +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Clan.hpp b/Include/Game/Interfaces/GameTabs/Clan.hpp index 49b6d87..5d71b73 100644 --- a/Include/Game/Interfaces/GameTabs/Clan.hpp +++ b/Include/Game/Interfaces/GameTabs/Clan.hpp @@ -13,7 +13,7 @@ namespace Clan bool Open(); std::vector GetAll(); std::vector GetAll(const std::function& Filter); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Combat.hpp b/Include/Game/Interfaces/GameTabs/Combat.hpp index 2a86972..97b8680 100644 --- a/Include/Game/Interfaces/GameTabs/Combat.hpp +++ b/Include/Game/Interfaces/GameTabs/Combat.hpp @@ -29,7 +29,7 @@ namespace Combat bool SetStyle(const std::string& Style); bool SetStyle(std::int32_t Index); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Emotes.hpp b/Include/Game/Interfaces/GameTabs/Emotes.hpp index ff9bdda..363fa73 100644 --- a/Include/Game/Interfaces/GameTabs/Emotes.hpp +++ b/Include/Game/Interfaces/GameTabs/Emotes.hpp @@ -7,7 +7,7 @@ namespace Emotes { bool IsOpen(); bool Open(); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Equipment.hpp b/Include/Game/Interfaces/GameTabs/Equipment.hpp index 1d3f323..ed66cc2 100644 --- a/Include/Game/Interfaces/GameTabs/Equipment.hpp +++ b/Include/Game/Interfaces/GameTabs/Equipment.hpp @@ -81,7 +81,7 @@ namespace Equipment bool Unequip(std::int32_t ID); bool Unequip(const std::string& Name); bool Unequip(const Interactable::Item& Item); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Friends.hpp b/Include/Game/Interfaces/GameTabs/Friends.hpp index 13e6e12..d67fff7 100644 --- a/Include/Game/Interfaces/GameTabs/Friends.hpp +++ b/Include/Game/Interfaces/GameTabs/Friends.hpp @@ -13,7 +13,7 @@ namespace Friends bool Open(); std::vector GetAll(); std::vector GetAll(const std::function& Filter); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Ignores.hpp b/Include/Game/Interfaces/GameTabs/Ignores.hpp index f2573f0..41f2902 100644 --- a/Include/Game/Interfaces/GameTabs/Ignores.hpp +++ b/Include/Game/Interfaces/GameTabs/Ignores.hpp @@ -13,7 +13,7 @@ namespace Ignores bool Open(); std::vector GetAll(); std::vector GetAll(const std::function& Filter); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Inventory.hpp b/Include/Game/Interfaces/GameTabs/Inventory.hpp index 8d5beb9..e9a270e 100644 --- a/Include/Game/Interfaces/GameTabs/Inventory.hpp +++ b/Include/Game/Interfaces/GameTabs/Inventory.hpp @@ -96,7 +96,7 @@ namespace Inventory bool Drop(std::int32_t ID, bool AllowShiftClick = true); bool Drop(const std::string& Name, bool AllowShiftClick = true); bool Drop(const Interactable::Item& Item, bool AllowShiftClick = true); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Logout.hpp b/Include/Game/Interfaces/GameTabs/Logout.hpp index c309d38..2d5d949 100644 --- a/Include/Game/Interfaces/GameTabs/Logout.hpp +++ b/Include/Game/Interfaces/GameTabs/Logout.hpp @@ -26,7 +26,7 @@ namespace Logout Interactable::Widget GetWorldWidget(const Internal::World& World); Interactable::Widget GetWorldWidget(std::int32_t WorldID); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Magic.hpp b/Include/Game/Interfaces/GameTabs/Magic.hpp index 950d643..96b1e64 100644 --- a/Include/Game/Interfaces/GameTabs/Magic.hpp +++ b/Include/Game/Interfaces/GameTabs/Magic.hpp @@ -172,7 +172,7 @@ namespace Magic bool CastSpell(const SPELL& Spell); bool SelectSpell(const SPELL& Spell); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Music.hpp b/Include/Game/Interfaces/GameTabs/Music.hpp index 6f2a09f..f444099 100644 --- a/Include/Game/Interfaces/GameTabs/Music.hpp +++ b/Include/Game/Interfaces/GameTabs/Music.hpp @@ -7,7 +7,7 @@ namespace Music { bool IsOpen(); bool Open(); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Options.hpp b/Include/Game/Interfaces/GameTabs/Options.hpp index 4a6643a..d26d0eb 100644 --- a/Include/Game/Interfaces/GameTabs/Options.hpp +++ b/Include/Game/Interfaces/GameTabs/Options.hpp @@ -13,7 +13,7 @@ namespace Options bool GetRunMode(); bool ToggleRunMode(bool Toggle); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Prayer.hpp b/Include/Game/Interfaces/GameTabs/Prayer.hpp index ab22785..8a77d0b 100644 --- a/Include/Game/Interfaces/GameTabs/Prayer.hpp +++ b/Include/Game/Interfaces/GameTabs/Prayer.hpp @@ -50,7 +50,7 @@ namespace Prayer bool WaitPrayer(std::uint32_t Duration, std::uint32_t Step, PRAYERS Prayer, bool Active); bool Activate(PRAYERS Prayer); bool Deactivate(PRAYERS Prayer); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Quests.hpp b/Include/Game/Interfaces/GameTabs/Quests.hpp index 9dae510..bc229a0 100644 --- a/Include/Game/Interfaces/GameTabs/Quests.hpp +++ b/Include/Game/Interfaces/GameTabs/Quests.hpp @@ -7,7 +7,7 @@ namespace Quests { bool IsOpen(); bool Open(); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Stats.hpp b/Include/Game/Interfaces/GameTabs/Stats.hpp index 91cfd90..a23fad7 100644 --- a/Include/Game/Interfaces/GameTabs/Stats.hpp +++ b/Include/Game/Interfaces/GameTabs/Stats.hpp @@ -43,7 +43,7 @@ namespace Stats std::int32_t GetRealLevel(SKILLS Skill); std::int64_t GetExperience(SKILLS Skill); std::int32_t GetExperienceTo(SKILLS Skill, std::int32_t Level); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/Login.hpp b/Include/Game/Interfaces/Login.hpp index 5084019..3da0587 100644 --- a/Include/Game/Interfaces/Login.hpp +++ b/Include/Game/Interfaces/Login.hpp @@ -76,7 +76,7 @@ namespace Login * @return a world box corresponding to the world select screen. */ Box GetWorldBox(std::uint32_t Index); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/Mainscreen.hpp b/Include/Game/Interfaces/Mainscreen.hpp index c54b098..cbedf1a 100644 --- a/Include/Game/Interfaces/Mainscreen.hpp +++ b/Include/Game/Interfaces/Mainscreen.hpp @@ -45,7 +45,7 @@ namespace Mainscreen bool WaitUpTextContains(std::uint32_t Duration, std::uint32_t Step, const std::string& UpText); bool WaitUpTextContains(std::uint32_t Duration, std::uint32_t Step, const std::vector& UpTexts); bool ClickTile(const Tile& T); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/Makescreen.hpp b/Include/Game/Interfaces/Makescreen.hpp index 098073e..c110b80 100644 --- a/Include/Game/Interfaces/Makescreen.hpp +++ b/Include/Game/Interfaces/Makescreen.hpp @@ -36,7 +36,7 @@ namespace Makescreen * @return Text of the middle widget when the Makescreen is open */ std::string GetCraftingName(); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/Menu.hpp b/Include/Game/Interfaces/Menu.hpp index 7e5e299..fc51e28 100644 --- a/Include/Game/Interfaces/Menu.hpp +++ b/Include/Game/Interfaces/Menu.hpp @@ -294,7 +294,7 @@ namespace Menu * @return Box representing the full menu, returns a null box if the menu isn't open */ Box GetBox(); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/Minimap.hpp b/Include/Game/Interfaces/Minimap.hpp index 74f3a14..54bf99d 100644 --- a/Include/Game/Interfaces/Minimap.hpp +++ b/Include/Game/Interfaces/Minimap.hpp @@ -86,7 +86,7 @@ namespace Minimap bool WalkPath(const std::vector& Path, std::int32_t Distance, std::int32_t Random, std::function Func); bool IsReachable(const Tile& T); -}; +} /** @} */ diff --git a/Include/Game/Interfaces/Trade.hpp b/Include/Game/Interfaces/Trade.hpp index 4bd71d9..dec0d07 100644 --- a/Include/Game/Interfaces/Trade.hpp +++ b/Include/Game/Interfaces/Trade.hpp @@ -16,6 +16,6 @@ namespace Trade std::vector GetTheirOfferItemIDs(); std::vector GetTheirOfferItemNames(); std::vector GetTheirOfferItemAmounts(); -}; +} #endif // TRADE_HPP_INCLUDED diff --git a/Include/Game/Models/DecorativeObjects.hpp b/Include/Game/Models/DecorativeObjects.hpp index ebdb318..2af146b 100644 --- a/Include/Game/Models/DecorativeObjects.hpp +++ b/Include/Game/Models/DecorativeObjects.hpp @@ -26,7 +26,7 @@ namespace DecorativeObjects Interactable::DecorativeObject Get(const std::vector& IDs, std::int32_t Distance = -1); Interactable::DecorativeObject Get(const std::vector& Names, std::int32_t Distance = -1); Interactable::DecorativeObject Get(const std::function& Filter, std::int32_t Distance = -1); -}; +} /** @} */ diff --git a/Include/Game/Models/GameObjects.hpp b/Include/Game/Models/GameObjects.hpp index caf7f6c..0529d6e 100644 --- a/Include/Game/Models/GameObjects.hpp +++ b/Include/Game/Models/GameObjects.hpp @@ -27,7 +27,7 @@ namespace GameObjects Interactable::GameObject Get(const std::vector& IDs, std::int32_t Distance = -1); Interactable::GameObject Get(const std::vector& Names, std::int32_t Distance = -1); Interactable::GameObject Get(const std::function& Filter, std::int32_t Distance = -1); -}; +} /** @} */ diff --git a/Include/Game/Models/GroundItems.hpp b/Include/Game/Models/GroundItems.hpp index b45d54d..e04aece 100644 --- a/Include/Game/Models/GroundItems.hpp +++ b/Include/Game/Models/GroundItems.hpp @@ -27,7 +27,7 @@ namespace GroundItems Interactable::GroundItem Get(const std::vector& IDs, std::int32_t Distance = -1); Interactable::GroundItem Get(const std::vector& Names, std::int32_t Distance = -1); Interactable::GroundItem Get(const std::function& Filter, std::int32_t Distance = -1); -}; +} /** @} */ #endif // GROUNDITEMS_HPP_INCLUDED diff --git a/Include/Game/Models/GroundObjects.hpp b/Include/Game/Models/GroundObjects.hpp index ead9a71..17834e1 100644 --- a/Include/Game/Models/GroundObjects.hpp +++ b/Include/Game/Models/GroundObjects.hpp @@ -26,7 +26,7 @@ namespace GroundObjects Interactable::GroundObject Get(const std::vector& IDs, std::int32_t Distance = -1); Interactable::GroundObject Get(const std::vector& Names, std::int32_t Distance = -1); Interactable::GroundObject Get(const std::function& Filter, std::int32_t Distance = -1); -}; +} /** @} */ diff --git a/Include/Game/Models/NPCs.hpp b/Include/Game/Models/NPCs.hpp index f39e222..e7cd777 100644 --- a/Include/Game/Models/NPCs.hpp +++ b/Include/Game/Models/NPCs.hpp @@ -28,7 +28,7 @@ namespace NPCs Interactable::NPC Get(const std::vector& IDs, std::int32_t Distance = -1); Interactable::NPC Get(const std::vector& Names, std::int32_t Distance = -1); Interactable::NPC Get(const std::function& Filter, std::int32_t Distance = -1); -}; +} /** @} */ #endif // NPCS_HPP_INCLUDED diff --git a/Include/Game/Models/Players.hpp b/Include/Game/Models/Players.hpp index 6d11ab6..1f588f3 100644 --- a/Include/Game/Models/Players.hpp +++ b/Include/Game/Models/Players.hpp @@ -24,7 +24,7 @@ namespace Players Interactable::Player Get(const std::string& Name, std::int32_t Distance = -1); Interactable::Player Get(const std::vector& Names, std::int32_t Distance = -1); Interactable::Player Get(const std::function& Filter, std::int32_t Distance = -1); -}; +} /** @} */ diff --git a/Include/Game/Models/Projectiles.hpp b/Include/Game/Models/Projectiles.hpp index c462c1c..5fd6b99 100644 --- a/Include/Game/Models/Projectiles.hpp +++ b/Include/Game/Models/Projectiles.hpp @@ -21,7 +21,7 @@ namespace Projectiles Interactable::Projectile Get(std::int32_t ID, std::int32_t Distance = -1); Interactable::Projectile Get(const std::vector& IDs, std::int32_t Distance = -1); Interactable::Projectile Get(const std::function& Filter, std::int32_t Distance = -1); -}; +} #endif // PROJECTILES_HPP_INCLUDED diff --git a/Include/Game/Models/WallObjects.hpp b/Include/Game/Models/WallObjects.hpp index 07991ee..87ffe8e 100644 --- a/Include/Game/Models/WallObjects.hpp +++ b/Include/Game/Models/WallObjects.hpp @@ -26,7 +26,7 @@ namespace WallObjects Interactable::WallObject Get(const std::vector& IDs, std::int32_t Distance = -1); Interactable::WallObject Get(const std::vector& Names, std::int32_t Distance = -1); Interactable::WallObject Get(const std::function& Filter, std::int32_t Distance = -1); -}; +} /** @} */ diff --git a/Include/Game/Tools/Antiban.hpp b/Include/Game/Tools/Antiban.hpp index 3ddf2d1..c90385a 100644 --- a/Include/Game/Tools/Antiban.hpp +++ b/Include/Game/Tools/Antiban.hpp @@ -9,6 +9,6 @@ namespace Antiban void MouseOffClient(bool LoseFocus = true); void SetClientSize(std::int32_t Width, std::int32_t Height); void MaximizeClient(); -}; +} #endif // ANTIBAN_HPP_INCLUDED diff --git a/Include/Game/Tools/BreakHandler.hpp b/Include/Game/Tools/BreakHandler.hpp index c63d818..86a4673 100644 --- a/Include/Game/Tools/BreakHandler.hpp +++ b/Include/Game/Tools/BreakHandler.hpp @@ -13,6 +13,6 @@ namespace BreakHandler bool ShortBreak(bool Logout = true); bool LongBreak(bool Logout = true); bool Break(bool LogoutOnLong = true, bool LogoutOnShort = true, bool LogoutOnMini = false); -}; +} #endif // BREAKHANDLER_HPP_INCLUDED diff --git a/Include/Game/Tools/Camera.hpp b/Include/Game/Tools/Camera.hpp index 8ab23c9..e26f9dc 100644 --- a/Include/Game/Tools/Camera.hpp +++ b/Include/Game/Tools/Camera.hpp @@ -113,7 +113,7 @@ namespace Camera * @return true if the camera sets the pitch (+/-) 10 of the passed pitch */ bool SetPitch(CAMERA_PITCH Pitch); -}; +} /** @} */ diff --git a/Include/Game/Tools/Interact.hpp b/Include/Game/Tools/Interact.hpp index 2239789..b2f7a9a 100644 --- a/Include/Game/Tools/Interact.hpp +++ b/Include/Game/Tools/Interact.hpp @@ -37,7 +37,7 @@ namespace Interact bool HoldKey(std::int32_t Key, std::uint32_t Duration); bool TypeKey(std::int32_t Key); bool TypeString(const std::string& String, bool PressEnter = false); -}; +} /** @} */ diff --git a/Include/Game/Tools/Pathfinding.hpp b/Include/Game/Tools/Pathfinding.hpp index 2f69b7a..29381a4 100644 --- a/Include/Game/Tools/Pathfinding.hpp +++ b/Include/Game/Tools/Pathfinding.hpp @@ -136,6 +136,6 @@ namespace Pathfinding static std::vector Finder_BFS( std::uint32_t StartX, std::uint32_t StartY, const std::vector>& Ends, std::int32_t Options );*/ -}; +} #endif // PATHFINDING_HPP_INCLUDED diff --git a/Include/Game/Tools/Profile.hpp b/Include/Game/Tools/Profile.hpp index c0a5843..ab57695 100644 --- a/Include/Game/Tools/Profile.hpp +++ b/Include/Game/Tools/Profile.hpp @@ -124,7 +124,7 @@ namespace Profile void SetPointGenAccuracy(double Accuracy); -}; +} /** @} */ diff --git a/Include/Game/Tools/RandomHandler.hpp b/Include/Game/Tools/RandomHandler.hpp index 60022c5..6415ec3 100644 --- a/Include/Game/Tools/RandomHandler.hpp +++ b/Include/Game/Tools/RandomHandler.hpp @@ -11,6 +11,6 @@ namespace RandomHandler Countdown GetCheckCountdown(); Counter GetRandomsCounter(); bool Check(); -}; +} #endif // RANDOMHANDLER_HPP_INCLUDED diff --git a/Include/Game/Tools/Settings.hpp b/Include/Game/Tools/Settings.hpp index 27c5804..35fab36 100644 --- a/Include/Game/Tools/Settings.hpp +++ b/Include/Game/Tools/Settings.hpp @@ -13,12 +13,13 @@ namespace Settings std::int32_t GetSetting(std::int32_t SettingIndex); std::int32_t GetSetting(std::int32_t SettingIndex, std::int32_t BitMask); bool GetSettingBit(std::int32_t SettingIndex, std::int32_t BitIndex); - + std::int32_t GetScreenType(); bool IsEscToCloseInterfacesOn(); bool IsShiftClickToDropOn(); -}; + bool IsScrollToZoomOn(); +} /** @} */ diff --git a/Include/Game/Tools/Widgets.hpp b/Include/Game/Tools/Widgets.hpp index f545d2b..8bef426 100644 --- a/Include/Game/Tools/Widgets.hpp +++ b/Include/Game/Tools/Widgets.hpp @@ -17,7 +17,7 @@ namespace Widgets Interactable::Widget Get(std::int32_t Parent, std::int32_t Child = -1); Interactable::Widget Get(std::int32_t Parent, std::int32_t Child, std::int32_t Grandchild); Interactable::Widget Get(const std::function& Filter); -}; +} /** @} */ diff --git a/Include/Game/Tools/Worlds.hpp b/Include/Game/Tools/Worlds.hpp index 222b6c5..64dcd0a 100644 --- a/Include/Game/Tools/Worlds.hpp +++ b/Include/Game/Tools/Worlds.hpp @@ -30,7 +30,7 @@ namespace Worlds Internal::World GetBy(std::int32_t WorldID); std::vector GetBy(const std::function& Filter); -}; +} /** @} */ diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index cc7f052..b98a98a 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ