Release 0.29

master
Kasi 2018-04-15 06:08:42 +01:00
parent c18a4cfcc1
commit d7f6f0a82a
7 changed files with 70 additions and 3 deletions

View File

@ -21,11 +21,11 @@ namespace Internal
std::int32_t GetHash() const; std::int32_t GetHash() const;
std::int32_t GetOffsetX() const; std::int32_t GetOffsetX() const;
std::int32_t GetOffsetY() const; std::int32_t GetOffsetY() const;
std::int32_t GetPlane() const;
std::int32_t GetRenderInfo() const; std::int32_t GetRenderInfo() const;
Renderable GetRenderable() const; Renderable GetRenderable() const;
std::int32_t GetX() const; std::int32_t GetX() const;
std::int32_t GetY() const; std::int32_t GetY() const;
std::int32_t GetZ() const;
}; };
} }

View File

@ -17,11 +17,11 @@ namespace Internal
static Class GetClass(); static Class GetClass();
std::int32_t GetHash() const; std::int32_t GetHash() const;
std::int32_t GetPlane() const;
std::int32_t GetRenderInfo() const; std::int32_t GetRenderInfo() const;
Renderable GetRenderable() const; Renderable GetRenderable() const;
std::int32_t GetX() const; std::int32_t GetX() const;
std::int32_t GetY() const; std::int32_t GetY() const;
std::int32_t GetZ() const;
}; };
} }

View File

@ -20,10 +20,10 @@ namespace Internal
std::int32_t GetFlags() const; std::int32_t GetFlags() const;
std::int32_t GetHash() const; std::int32_t GetHash() const;
std::int32_t GetHeight() const; std::int32_t GetHeight() const;
std::int32_t GetPlane() const;
Renderable GetRenderable() const; Renderable GetRenderable() const;
std::int32_t GetX() const; std::int32_t GetX() const;
std::int32_t GetY() const; std::int32_t GetY() const;
std::int32_t GetZ() const;
}; };
} }

View File

@ -44,6 +44,8 @@
#include "Interactable/GameObject.hpp" #include "Interactable/GameObject.hpp"
#include "Interactable/GroundObject.hpp" #include "Interactable/GroundObject.hpp"
#include "Interactable/WallObject.hpp" #include "Interactable/WallObject.hpp"
#include "Interactable/Player.hpp"
#include "Interactable/NPC.hpp"
#include "Tools/RandomHandler.hpp" #include "Tools/RandomHandler.hpp"

View File

@ -0,0 +1,33 @@
#ifndef INTERACTABLENPC_HPP_INCLUDED
#define INTERACTABLENPC_HPP_INCLUDED
#include "../../Core/Classes/NPC.hpp"
#include "../../Core/Classes/NPCInfo.hpp"
#include "../../Core/Types/Tile.hpp"
#include "../../Core/Types/Point.hpp"
#include "../../Core/Types/Convex.hpp"
#include <cstdint>
namespace Interactable
{
class NPC : public Internal::NPC
{
public:
NPC(const Internal::NPC& N);
NPC(const NPC& N);
std::int32_t GetID() const;
std::string GetName() const;
Tile GetTile() const;
Internal::NPCInfo GetInfo() const;
std::vector<Point> GetModel() const;
Convex GetConvex() const;
Internal::Character GetInteracting() const;
bool Interacting() const;
bool Interacting(const Internal::Character& C) const;
operator Internal::NPC() const;
};
}
#endif // INTERACTABLENPC_HPP_INCLUDED

View File

@ -0,0 +1,32 @@
#ifndef INTERACTABLEPLAYER_HPP_INCLUDED
#define INTERACTABLEPLAYER_HPP_INCLUDED
#include "../../Core/Classes/Player.hpp"
#include "../../Core/Classes/PlayerInfo.hpp"
#include "../../Core/Types/Tile.hpp"
#include "../../Core/Types/Point.hpp"
#include "../../Core/Types/Convex.hpp"
#include <cstdint>
namespace Interactable
{
class Player : public Internal::Player
{
public:
Player(const Internal::Player& P);
Player(const Player& P);
Tile GetTile() const;
Internal::PlayerInfo GetInfo() const;
std::vector<Point> GetModel() const;
Convex GetConvex() const;
Internal::Character GetInteracting() const;
bool Interacting() const;
bool Interacting(const Internal::Character& C) const;
operator Internal::Player() const;
};
}
#endif // INTERACTABLEPLAYER_HPP_INCLUDED

Binary file not shown.