public inheritance
This commit is contained in:
@@ -13,7 +13,7 @@
|
|||||||
class ContentLUT;
|
class ContentLUT;
|
||||||
class ContentIndices;
|
class ContentIndices;
|
||||||
|
|
||||||
class Inventory : Serializable {
|
class Inventory : public Serializable {
|
||||||
int64_t id;
|
int64_t id;
|
||||||
std::vector<ItemStack> slots;
|
std::vector<ItemStack> slots;
|
||||||
public:
|
public:
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ struct PlayerInput {
|
|||||||
bool flight;
|
bool flight;
|
||||||
};
|
};
|
||||||
|
|
||||||
class Player : Object, Serializable {
|
class Player : public Object, public Serializable {
|
||||||
float speed;
|
float speed;
|
||||||
int chosenSlot;
|
int chosenSlot;
|
||||||
glm::vec3 spawnpoint {};
|
glm::vec3 spawnpoint {};
|
||||||
|
|||||||
+1
-1
@@ -26,7 +26,7 @@ public:
|
|||||||
world_load_error(std::string message);
|
world_load_error(std::string message);
|
||||||
};
|
};
|
||||||
|
|
||||||
class World : Serializable {
|
class World : public Serializable {
|
||||||
std::string name;
|
std::string name;
|
||||||
uint64_t seed;
|
uint64_t seed;
|
||||||
EngineSettings& settings;
|
EngineSettings& settings;
|
||||||
|
|||||||
Reference in New Issue
Block a user