diff --git a/Include/Core/Types/Wireframe.hpp b/Include/Core/Types/Wireframe.hpp index 6e06799..d7b690c 100644 --- a/Include/Core/Types/Wireframe.hpp +++ b/Include/Core/Types/Wireframe.hpp @@ -21,7 +21,6 @@ class Wireframe Convex GetConvex() const; bool Contains(const Point& P) const; operator bool() const; - private: std::vector Points; std::vector Triangles; Convex C; diff --git a/Include/Game/Interfaces/GameTabs/Magic.hpp b/Include/Game/Interfaces/GameTabs/Magic.hpp index c6ccab8..ec507c3 100644 --- a/Include/Game/Interfaces/GameTabs/Magic.hpp +++ b/Include/Game/Interfaces/GameTabs/Magic.hpp @@ -10,7 +10,7 @@ class Magic { public: - typedef enum SPELLS + typedef enum SPELL { NORMAL_LUMBRIDGE_HOME_TELEPORT, NORMAL_WIND_STRIKE, @@ -151,20 +151,21 @@ class Magic ANCIENT_GHORROCK_TELEPORT, ANCIENT_TELEPORT_TO_BOUNTY_TARGET, ANCIENT_EDGEVILLE_HOME_TELEPORT - } SPELLS; + } SPELL; static bool IsOpen(); static bool Open(); - static bool HasLevel(SPELLS Spell); + static bool HasLevel(const SPELL& Spell); static bool IsSpellSelected(); - static bool IsSpellSelected(SPELLS Spell); + static bool IsSpellSelected(const SPELL& Spell); static bool IsSpellSelected(const std::string& Name); static std::string GetSelectedSpellName(); - static bool SelectSpell(SPELLS Spell); + static bool CastSpell(const SPELL& Spell); + static bool SelectSpell(const SPELL& Spell); }; /** @} */ diff --git a/Include/Game/Interfaces/Login.hpp b/Include/Game/Interfaces/Login.hpp index 3e200a6..fad9501 100644 --- a/Include/Game/Interfaces/Login.hpp +++ b/Include/Game/Interfaces/Login.hpp @@ -23,12 +23,11 @@ class Login AUTHENTICATOR, // 4 FORGOTTEN_PASSWORD, // 5 RUNESCAPE_UPDATED, - TEMP_BANNED, ACCOUNT_LOCKED, MEMBERS_AREA, MEMBERS_REQUIRED, WORLD_SELECT, - PERM_BANNED, + ACCOUNT_DISABLED, CONNECTING, LOADING, LOBBY_SCREEN, @@ -37,7 +36,7 @@ class Login static LOGIN_SCREEN_STATE GetLoginScreenState(); - static bool LoginPlayer(); + static bool LoginPlayer(bool SwitchWorlds = true); static bool EnterCredentials(); static bool IsWorldSelectOpen(); diff --git a/Include/Game/Interfaces/Mainscreen.hpp b/Include/Game/Interfaces/Mainscreen.hpp index f6ae654..9415763 100644 --- a/Include/Game/Interfaces/Mainscreen.hpp +++ b/Include/Game/Interfaces/Mainscreen.hpp @@ -33,7 +33,6 @@ class Mainscreen static Mainscreen::CROSSHAIR_STATE GetCrosshairState(); static bool IsLoggedIn(); - static bool IsPlaying(); static std::string GetUpText(); static bool UpTextContains(const std::string& UpText); diff --git a/Include/Game/Tools/Profile.hpp b/Include/Game/Tools/Profile.hpp index 380271d..ae2ed97 100644 --- a/Include/Game/Tools/Profile.hpp +++ b/Include/Game/Tools/Profile.hpp @@ -16,6 +16,7 @@ class Profile static std::string GetPassword(); static std::string GetBankPin(); static std::int32_t GetWorld(); + static void SetWorld(std::int32_t World); static bool GetIsMember(); static bool GetHasPin(); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index a38252e..f070bc3 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ