diff --git a/Include/Core/Classes/Widget.hpp b/Include/Core/Classes/Widget.hpp index 2d3cff0..0573979 100644 --- a/Include/Core/Classes/Widget.hpp +++ b/Include/Core/Classes/Widget.hpp @@ -23,7 +23,6 @@ namespace Internal static Class GetClass(); std::vector GetActions() const; - std::int32_t GetBorderThickness() const; std::int32_t GetBoxIndex() const; std::vector GetChildren() const; Widget GetChildren(std::int32_t I) const; @@ -40,6 +39,7 @@ namespace Internal std::int32_t GetModelID() const; std::string GetName() const; bool GetNoClickThrough() const; + std::int32_t GetOutline() const; Widget GetParent() const; std::int32_t GetParentID() const; std::int32_t GetRelativeX() const; diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index 491cba7..ad16ad6 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -159,8 +159,6 @@ namespace Internal IndexableData GetItemIndexableData(); Cache GetItemInfoCache(); Cache GetItemModelCache(); - std::int32_t GetItemSelected(); - std::int32_t GetItemSelectedIndex(); Cache GetItemSpriteCache(); std::vector GetKeysPressed(); std::vector GetLevels(); @@ -211,10 +209,9 @@ namespace Internal std::vector GetPlayers(); Deque GetProjectiles(); std::int32_t GetRunEnergy(); - std::string GetSelectedItemName(); - std::string GetSelectedSpellName(); + bool GetSelected(); + std::string GetSelectedText(); std::vector GetSettings(); - bool GetSpellSelected(); Cache GetSpotAnimationCache(); Cache GetSpotAnimationModelCache(); std::vector>> GetTileHeights(); @@ -313,7 +310,7 @@ namespace Internal std::vector> GetVisibilityMap(std::int32_t CameraPitch, std::int32_t CameraYaw); std::int32_t GetTileHeights(std::int32_t X, std::int32_t Y, std::int32_t Plane); std::int8_t GetTileSettings(std::int32_t X, std::int32_t Y, std::int32_t Plane); - + std::int32_t GetCollisionFlags(std::int32_t X, std::int32_t Y, std::int32_t Plane); std::vector ToByteArray(const Object& O); } #endif // INTERNAL_HPP_INCLUDED diff --git a/Include/Core/JavaClass/Object.hpp b/Include/Core/JavaClass/Object.hpp index 0b592bb..1720853 100644 --- a/Include/Core/JavaClass/Object.hpp +++ b/Include/Core/JavaClass/Object.hpp @@ -11,11 +11,11 @@ namespace Internal public: void* Obj = nullptr; - Object(const void* Obj = nullptr); - Object(Object&& Obj); - Object(const Object& Obj); - Object& operator=(Object&& Obj); - Object& operator=(const Object& Obj); + Object(const void* Obj = nullptr) noexcept; + Object(Object&& Obj) noexcept; + Object(const Object& Obj) noexcept; + Object& operator=(Object&& Obj) noexcept; + Object& operator=(const Object& Obj) noexcept; bool operator==(const Object& O) const; bool operator!=(const Object& O) const; diff --git a/Include/Game/Interfaces/GameTabs/Inventory.hpp b/Include/Game/Interfaces/GameTabs/Inventory.hpp index 53a7834..2ca12bc 100644 --- a/Include/Game/Interfaces/GameTabs/Inventory.hpp +++ b/Include/Game/Interfaces/GameTabs/Inventory.hpp @@ -35,6 +35,8 @@ namespace Inventory bool IsEmpty(); bool IsFull(); + std::int32_t GetItemSelectedIndex(); + bool IsItemSelected(); bool IsItemSelected(std::int32_t ID); bool IsItemSelected(const std::string& Name); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 08fc61d..1ce2bf8 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ