Release 0.15
							parent
							
								
									2550477852
								
							
						
					
					
						commit
						0702172a39
					
				| 
						 | 
				
			
			@ -183,9 +183,11 @@ namespace Internal
 | 
			
		|||
    bool LoadWorlds();
 | 
			
		||||
    void SetWorld(const World& W);
 | 
			
		||||
 | 
			
		||||
    Node GetHashTableNode(const HashTable& Table, std::int32_t Index);
 | 
			
		||||
    ItemInfo GetItemInfo(std::int32_t ID);
 | 
			
		||||
    NPCInfo GetNPCInfo(std::int32_t ID);
 | 
			
		||||
    ObjectInfo GetObjectInfo(std::int32_t ID);
 | 
			
		||||
    ObjectInfo GetObjectInfo(std::int32_t ID, const std::vector<Node>& Buckets);
 | 
			
		||||
    Widget GetWidget(std::int32_t Container, std::int32_t Component);
 | 
			
		||||
    Widget GetWidgetParent(const Widget& W);
 | 
			
		||||
    std::int32_t GetWidgetX(const Widget& W);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -36,6 +36,7 @@
 | 
			
		|||
#include "Models/GroundItems.hpp"
 | 
			
		||||
#include "Models/NPCs.hpp"
 | 
			
		||||
#include "Models/Players.hpp"
 | 
			
		||||
#include "Models/GameObjects.hpp"
 | 
			
		||||
 | 
			
		||||
#include "Interactable/GameObject.hpp"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,9 +17,7 @@ class Logout
 | 
			
		|||
        static bool LogoutPlayer();
 | 
			
		||||
 | 
			
		||||
        static bool IsWorldSwitcherOpen();
 | 
			
		||||
 | 
			
		||||
        static bool OpenWorldSwitcher();
 | 
			
		||||
        static bool OpenWorldSwitcher(bool OpenInventory);
 | 
			
		||||
        static bool OpenWorldSwitcher(bool OpenInventory = false);
 | 
			
		||||
 | 
			
		||||
        static bool WorldSwitcherScrollTo(Internal::World World);
 | 
			
		||||
        static bool WorldSwitcherScrollTo(std::int32_t WorldID);
 | 
			
		||||
| 
						 | 
				
			
			@ -27,10 +25,11 @@ class Logout
 | 
			
		|||
        static bool SwitchWorld(Internal::World World);
 | 
			
		||||
        static bool SwitchWorld(std::int32_t WorldID);
 | 
			
		||||
 | 
			
		||||
        static std::vector<std::int32_t> GetFavoriteWorlds();
 | 
			
		||||
        static std::vector<std::uint32_t> GetFavoriteWorlds();
 | 
			
		||||
 | 
			
		||||
        static Internal::Widget GetWorldWidget(Internal::World World);
 | 
			
		||||
        static Internal::Widget GetWorldWidget(std::int32_t  WorldID);
 | 
			
		||||
        static Internal::Widget GetFavoriteWorldWidget(std::int32_t WorldID);
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
/** @} */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,6 +24,7 @@ class Login
 | 
			
		|||
            TEMP_BANNED,
 | 
			
		||||
            PERM_BANNED,
 | 
			
		||||
            ACCOUNT_LOCKED,
 | 
			
		||||
            MEMBER_AREA,
 | 
			
		||||
            WORLD_SELECT,
 | 
			
		||||
            CONNECTING,
 | 
			
		||||
            LOADING,
 | 
			
		||||
| 
						 | 
				
			
			@ -33,11 +34,10 @@ class Login
 | 
			
		|||
 | 
			
		||||
        static LOGIN_STATE GetState();
 | 
			
		||||
 | 
			
		||||
        static bool IsLoggedIn();
 | 
			
		||||
        static bool IsWorldSelectOpen();
 | 
			
		||||
        static bool CloseWorldSelect();
 | 
			
		||||
 | 
			
		||||
        static std::int32_t LoginPlayer();
 | 
			
		||||
        static bool LoginPlayer();
 | 
			
		||||
        static bool EnterCredentials();
 | 
			
		||||
 | 
			
		||||
        static bool SelectWorld();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -0,0 +1,40 @@
 | 
			
		|||
#ifndef GAMEOBJECTS_HPP_INCLUDED
 | 
			
		||||
#define GAMEOBJECTS_HPP_INCLUDED
 | 
			
		||||
 | 
			
		||||
#include "../../Core/Classes/GameObject.hpp"
 | 
			
		||||
#include "../../Core/Classes/ObjectInfo.hpp"
 | 
			
		||||
#include "../../Core/Types/Tile.hpp"
 | 
			
		||||
#include "../../Core/Types/Convex.hpp"
 | 
			
		||||
#include <functional>
 | 
			
		||||
#include <cstdint>
 | 
			
		||||
#include <vector>
 | 
			
		||||
#include <string>
 | 
			
		||||
 | 
			
		||||
class GameObjects
 | 
			
		||||
{
 | 
			
		||||
    public:
 | 
			
		||||
 | 
			
		||||
        static Internal::ObjectInfo GetInfoOf(const Internal::GameObject& G);
 | 
			
		||||
        static Tile GetTileOf(const Internal::GameObject& G);
 | 
			
		||||
        static std::vector<Point> GetModelOf(const Internal::GameObject& G);
 | 
			
		||||
        static Convex GetConvexOf(const Internal::GameObject& G);
 | 
			
		||||
 | 
			
		||||
        //consider changing to Interactable::GameObject
 | 
			
		||||
        static Internal::GameObject Get(const Tile& T);
 | 
			
		||||
        static Internal::GameObject Get(std::int32_t ID);
 | 
			
		||||
        static Internal::GameObject Get(const std::string& Name);
 | 
			
		||||
        static Internal::GameObject Get(const std::vector<std::int32_t>& PossibleIDs);
 | 
			
		||||
        static Internal::GameObject Get(const std::vector<std::string>& PossibleNames);
 | 
			
		||||
        static Internal::GameObject Get(const std::function<bool (Internal::GameObject&)>& Filter);
 | 
			
		||||
 | 
			
		||||
        static std::vector<Internal::GameObject> GetAll();
 | 
			
		||||
        static std::vector<Internal::GameObject> GetAll(const Tile& T);
 | 
			
		||||
        static std::vector<Internal::GameObject> GetAll(std::int32_t ID);
 | 
			
		||||
        static std::vector<Internal::GameObject> GetAll(const std::string& Name);
 | 
			
		||||
        static std::vector<Internal::GameObject> GetAll(const std::vector<std::int32_t>& PossibleIDs);
 | 
			
		||||
        static std::vector<Internal::GameObject> GetAll(const std::vector<std::string>& PossibleNames);
 | 
			
		||||
        static std::vector<Internal::GameObject> GetAll(const std::function<bool (Internal::GameObject&)>& Filter);
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#endif // GAMEOBJECTS_HPP_INCLUDED
 | 
			
		||||
| 
						 | 
				
			
			@ -19,7 +19,6 @@ class SceneObjects
 | 
			
		|||
{
 | 
			
		||||
    public:
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        typedef enum OBJECT_TYPE
 | 
			
		||||
        {
 | 
			
		||||
            GAME_OBJECT         = (1 << 1),
 | 
			
		||||
| 
						 | 
				
			
			@ -35,22 +34,14 @@ class SceneObjects
 | 
			
		|||
        static std::vector<Object> GetAll(const std::string& Name, OBJECT_TYPE ObjectTypes = ALL);
 | 
			
		||||
        static std::vector<Object> GetAll(const std::vector<std::int32_t>& PossibleIDs, OBJECT_TYPE ObjectTypes = ALL);
 | 
			
		||||
        static std::vector<Object> GetAll(const std::vector<std::string>& PossibleNames, OBJECT_TYPE ObjectTypes = ALL);
 | 
			
		||||
 | 
			
		||||
        static std::vector<Internal::GameObject> GetAll(const std::function<bool (Internal::GameObject&)>& Filter);
 | 
			
		||||
        static std::vector<Internal::DecorativeObject> GetAll(const std::function<bool (Internal::DecorativeObject&)>& Filter);
 | 
			
		||||
        static std::vector<Internal::GroundObject> GetAll(const std::function<bool (Internal::GroundObject&)>& Filter);
 | 
			
		||||
        static std::vector<Internal::WallObject> GetAll(const std::function<bool (Internal::WallObject&)>& Filter);
 | 
			
		||||
        static std::vector<Object> GetAll(const std::function<bool (const Object&)>& Filter, OBJECT_TYPE ObjectTypes = ALL);
 | 
			
		||||
 | 
			
		||||
        static Object Get(const Tile& T, OBJECT_TYPE ObjectTypes = ALL);
 | 
			
		||||
        static Object Get(std::int32_t ID, OBJECT_TYPE ObjectTypes = ALL);
 | 
			
		||||
        static Object Get(const std::string& Name, OBJECT_TYPE ObjectTypes = ALL);
 | 
			
		||||
        static Object Get(const std::vector<std::int32_t>& PossibleIDs, OBJECT_TYPE ObjectTypes = ALL);
 | 
			
		||||
        static Object Get(const std::vector<std::string>& PossibleNames, OBJECT_TYPE ObjectTypes = ALL);
 | 
			
		||||
 | 
			
		||||
        static Internal::GameObject Get(const std::function<bool (Internal::GameObject&)>& Filter);
 | 
			
		||||
        static Internal::DecorativeObject Get(const std::function<bool (Internal::DecorativeObject&)>& Filter);
 | 
			
		||||
        static Internal::GroundObject Get(const std::function<bool (Internal::GroundObject&)>& Filter);
 | 
			
		||||
        static Internal::WallObject Get(const std::function<bool (Internal::WallObject&)>& Filter);
 | 
			
		||||
        static Object Get(const std::function<bool (const Object&)>& Filter, OBJECT_TYPE ObjectTypes = ALL);
 | 
			
		||||
 | 
			
		||||
        static Internal::ObjectInfo GetInfoOf(const Object& O);
 | 
			
		||||
        static Internal::ObjectInfo GetInfoOf(const Internal::GameObject& G);
 | 
			
		||||
| 
						 | 
				
			
			@ -58,11 +49,13 @@ class SceneObjects
 | 
			
		|||
        static Internal::ObjectInfo GetInfoOf(const Internal::GroundObject& G);
 | 
			
		||||
        static Internal::ObjectInfo GetInfoOf(const Internal::WallObject& W);
 | 
			
		||||
 | 
			
		||||
        static Tile GetTileOf(const Object& O);
 | 
			
		||||
        static Tile GetTileOf(const Internal::GameObject& G);
 | 
			
		||||
        static Tile GetTileOf(const Internal::DecorativeObject& D);
 | 
			
		||||
        static Tile GetTileOf(const Internal::GroundObject& G);
 | 
			
		||||
        static Tile GetTileOf(const Internal::WallObject& W);
 | 
			
		||||
 | 
			
		||||
        static Convex GetConvexOf(const Object& O);
 | 
			
		||||
        static Convex GetConvexOf(const Internal::GameObject& G);
 | 
			
		||||
        static Convex GetConvexOf(const Internal::DecorativeObject& D);
 | 
			
		||||
        static Convex GetConvexOf(const Internal::GroundObject& G);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											Binary file not shown.
										
									
								
							
		Loading…
	
		Reference in New Issue