From 102ec6d865ec9fbfd5de8e5e39e5be989ce88734 Mon Sep 17 00:00:00 2001 From: DanielProl1xy Date: Mon, 19 Feb 2024 10:26:48 +0300 Subject: [PATCH] public inheritance --- src/items/Inventory.h | 2 +- src/objects/Player.h | 2 +- src/world/World.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/items/Inventory.h b/src/items/Inventory.h index 68226598..4a14f990 100644 --- a/src/items/Inventory.h +++ b/src/items/Inventory.h @@ -13,7 +13,7 @@ class ContentLUT; class ContentIndices; -class Inventory : Serializable { +class Inventory : public Serializable { int64_t id; std::vector slots; public: diff --git a/src/objects/Player.h b/src/objects/Player.h index 8ebcac54..22b1d859 100644 --- a/src/objects/Player.h +++ b/src/objects/Player.h @@ -33,7 +33,7 @@ struct PlayerInput { bool flight; }; -class Player : Object, Serializable { +class Player : public Object, public Serializable { float speed; int chosenSlot; glm::vec3 spawnpoint {}; diff --git a/src/world/World.h b/src/world/World.h index ca242d60..faf142e7 100644 --- a/src/world/World.h +++ b/src/world/World.h @@ -26,7 +26,7 @@ public: world_load_error(std::string message); }; -class World : Serializable { +class World : public Serializable { std::string name; uint64_t seed; EngineSettings& settings;