Release 1.99

master
Kasi 2024-04-05 17:31:05 +01:00
parent 570f3299eb
commit b9ac228d93
5 changed files with 56 additions and 29 deletions

View File

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

View File

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

View File

@ -12,29 +12,44 @@ namespace Login
{ {
typedef enum LOGIN_SCREEN_STATE typedef enum LOGIN_SCREEN_STATE
{ {
WELCOME_SCREEN, SCREEN_WELCOME_SCREEN,
PVP_WORLD, SCREEN_WELCOME_SCREEN_JAGEX_ACCOUNT,
ENTER_CREDENTIALS, SCREEN_PVP_WORLD,
INVALID_CREDENTIALS, SCREEN_ENTER_CREDENTIALS,
AUTHENTICATOR, SCREEN_INVALID_CREDENTIALS,
FORGOTTEN_PASSWORD, SCREEN_AUTHENTICATOR,
RUNESCAPE_UPDATED, SCREEN_FORGOTTEN_PASSWORD,
ACCOUNT_LOCKED, SCREEN_RUNESCAPE_UPDATED,
MEMBERS_AREA, SCREEN_ACCOUNT_LOCKED,
MEMBERS_REQUIRED, SCREEN_MEMBERS_AREA,
WORLD_SELECT, SCREEN_MEMBERS_REQUIRED,
ACCOUNT_DISABLED, SCREEN_WORLD_SELECT,
ACCOUNT_LOGGED_IN, SCREEN_ACCOUNT_DISABLED,
TOTAL_SKILL_REQUIRED, SCREEN_ACCOUNT_LOGGED_IN,
DISCONNECTED, SCREEN_TOTAL_SKILL_REQUIRED,
ERROR_CONNECTING, SCREEN_DISCONNECTED,
CONNECTION_TIMED_OUT, SCREEN_ERROR_CONNECTING,
TOO_MANY_ATTEMPTS, SCREEN_CONNECTION_TIMED_OUT,
CONNECTING, SCREEN_TOO_MANY_ATTEMPTS,
LOADING, SCREEN_CONNECTING,
LOBBY_SCREEN, SCREEN_LOADING,
LOGGED_IN SCREEN_LOBBY_SCREEN,
SCREEN_LOGGED_IN
} LOGIN_SCREEN_STATE; } 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(); LOGIN_SCREEN_STATE GetLoginScreenState();
@ -70,14 +85,9 @@ namespace Login
*/ */
std::vector<std::string> GetLoginMessages(); std::vector<std::string> GetLoginMessages();
/** Box GetButtonBox(BUTTON_BOX Button);
* @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();
bool WaitLoginScreenState(std::uint32_t Duration, std::uint32_t Step, Login::LOGIN_SCREEN_STATE State, bool Result = true); bool WaitLoginScreenState(std::uint32_t Duration, std::uint32_t Step, Login::LOGIN_SCREEN_STATE State, bool Result = true);
} }
#endif // LOGIN_HPP_INCLUDED #endif // LOGIN_HPP_INCLUDED

View File

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

Binary file not shown.