Release 1.99

Include/Core/Classes/Widget.hpp

@@ -44,6 +44,8 @@ namespace Internal
             std::int32_t GetParentID() const;
             std::int32_t GetRelativeX() const;
             std::int32_t GetRelativeY() const;
+            std::int32_t GetScrollHeight() const;
+            std::int32_t GetScrollWidth() const;
             std::int32_t GetScrollX() const;
             std::int32_t GetScrollY() const;
             std::int32_t GetShadowColor() const;

Include/Game/Interfaces/GameTabs/Prayer.hpp

@@ -49,6 +49,8 @@ namespace Prayer
     bool WaitPrayer(std::uint32_t Duration, std::uint32_t Step, PRAYERS Prayer, bool Active);
     bool Activate(PRAYERS Prayer);
     bool Deactivate(PRAYERS Prayer);
+
+    std::vector<Prayer::PRAYERS> GetActivePrayers();
 }
 
 #endif // PRAYER_HPP_INCLUDED

Include/Game/Interfaces/Login.hpp

@@ -12,30 +12,45 @@ namespace Login
 {
     typedef enum LOGIN_SCREEN_STATE
     {
-        WELCOME_SCREEN,
-        PVP_WORLD,
-        ENTER_CREDENTIALS,
-        INVALID_CREDENTIALS,
-        AUTHENTICATOR,
-        FORGOTTEN_PASSWORD,
-        RUNESCAPE_UPDATED,
-        ACCOUNT_LOCKED,
-        MEMBERS_AREA,
-        MEMBERS_REQUIRED,
-        WORLD_SELECT,
-        ACCOUNT_DISABLED,
-        ACCOUNT_LOGGED_IN,
-        TOTAL_SKILL_REQUIRED,
-        DISCONNECTED,
-        ERROR_CONNECTING,
-        CONNECTION_TIMED_OUT,
-        TOO_MANY_ATTEMPTS,
-        CONNECTING,
-        LOADING,
-        LOBBY_SCREEN,
-        LOGGED_IN
+        SCREEN_WELCOME_SCREEN,
+        SCREEN_WELCOME_SCREEN_JAGEX_ACCOUNT,
+        SCREEN_PVP_WORLD,
+        SCREEN_ENTER_CREDENTIALS,
+        SCREEN_INVALID_CREDENTIALS,
+        SCREEN_AUTHENTICATOR,
+        SCREEN_FORGOTTEN_PASSWORD,
+        SCREEN_RUNESCAPE_UPDATED,
+        SCREEN_ACCOUNT_LOCKED,
+        SCREEN_MEMBERS_AREA,
+        SCREEN_MEMBERS_REQUIRED,
+        SCREEN_WORLD_SELECT,
+        SCREEN_ACCOUNT_DISABLED,
+        SCREEN_ACCOUNT_LOGGED_IN,
+        SCREEN_TOTAL_SKILL_REQUIRED,
+        SCREEN_DISCONNECTED,
+        SCREEN_ERROR_CONNECTING,
+        SCREEN_CONNECTION_TIMED_OUT,
+        SCREEN_TOO_MANY_ATTEMPTS,
+        SCREEN_CONNECTING,
+        SCREEN_LOADING,
+        SCREEN_LOBBY_SCREEN,
+        SCREEN_LOGGED_IN
     } LOGIN_SCREEN_STATE;
     
+    typedef enum BUTTON_BOX {
+        BUTTON_EXISTING_USER,
+        BUTTON_LOGIN,
+        BUTTON_CANCEL,
+        BUTTON_TRY_AGAIN,
+        BUTTON_WORLD_SELECT,
+        BUTTON_WORLD_SELECT_CANCEL,
+        BUTTON_CONTINUE,
+        BUTTON_WORLD_SELECT_PREV,
+        BUTTON_WORLD_SELECT_NEXT,
+        BUTTON_OK,
+        BUTTON_PLAY_NOW
+    } BUTTON_BOX;
+
     LOGIN_SCREEN_STATE GetLoginScreenState();
 
     bool LoginPlayer(bool SwitchToProfileWorld = true);
@@ -70,14 +85,9 @@ namespace Login
     */
     std::vector<std::string> GetLoginMessages();
 
-    /**
-    * @return a vector of button boxes on the login screen
-    * 0: Existing User; 1: Login; 2: Cancel; 3: Try Again; 4: World Select; 5: World Select Cancel;
-    */
-    std::vector<Box> GetButtonBoxes();
+    Box GetButtonBox(BUTTON_BOX Button);
     
     bool WaitLoginScreenState(std::uint32_t Duration, std::uint32_t Step, Login::LOGIN_SCREEN_STATE State, bool Result = true);
-
 }
 
 #endif // LOGIN_HPP_INCLUDED

Include/Game/Tools/Camera.hpp

@@ -64,6 +64,14 @@ namespace Camera
      */
     bool RotateTo(const Tile& T, COMPASS_DIRECTION Direction = NORTH, std::int32_t Tolerance = 10);
 
+    bool RotateToWithMouse(std::int32_t Angle, std::int32_t Tolerance = 10);
+
+    bool RotateToWithMouse(COMPASS_DIRECTION Direction, std::int32_t Tolerance = 10);
+
+    bool RotateToWithMouse(const Tile& T, std::int32_t Angle = 0, std::int32_t Tolerance = 10);
+
+    bool RotateToWithMouse(const Tile& T, COMPASS_DIRECTION Direction = NORTH, std::int32_t Tolerance = 10);
+
     /**
      * @brief Sets the pitch of the camera
      *
@@ -71,6 +79,7 @@ namespace Camera
      * @return true if the camera sets the pitch (+/-) 10 of the passed pitch
      */
     bool SetPitch(std::int32_t Pitch);
+
     /**
      * @brief Sets the pitch of the camera
      *
@@ -79,6 +88,10 @@ namespace Camera
      */
     bool SetPitch(CAMERA_PITCH Pitch);
 
+    bool SetPitchWithMouse(std::int32_t Pitch);
+
+    bool SetPitchWithMouse(CAMERA_PITCH Pitch);
+    
 /*    *//**
     * @brief Sets the zoom of the camera
     *