move spawn index out of world

[blank.git] / src / world / World.hpp

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 8d822501bd07735d8c2448f9ec6250989d16e9aa..848f801e24ffd30bfb5d95cbe50c46f18278c159 100644 (file)
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -25,8 +25,8 @@ class World {
 public:
        struct Config {
                std::string name = "default";
-               // initial player position
-               glm::vec3 spawn = { 0.0f, 0.0f, 0.0f };
+               // chunk base where new players are spawned
+               glm::ivec3 spawn = { 0, 0, 0 };
                // direction facing towards(!) the light
                glm::vec3 light_direction = { -1.0f, -3.0f, -2.0f };
                // fade out reaches 1/e (0.3679) at 1/fog_density,
@@ -68,18 +68,21 @@ public:
        ChunkStore &Chunks() noexcept { return chunks; }
 
        /// add player with given name
-       /// returns nullptr in entity if the name is already taken
-       Player AddPlayer(const std::string &name);
+       /// returns nullptr if the name is already taken
+       Player *AddPlayer(const std::string &name);
        /// add player with given name and ID
-       /// returns nullptr in entity if the name or ID is already taken
-       Player AddPlayer(const std::string &name, std::uint32_t id);
+       /// returns nullptr if the name or ID is already taken
+       Player *AddPlayer(const std::string &name, std::uint32_t id);
        /// add an entity with an autogenerated ID
        Entity &AddEntity();
        /// add entity with given ID
        /// returns nullptr if the ID is already taken
        Entity *AddEntity(std::uint32_t id);
+       /// add entity with given ID
+       /// returs an existing entity if ID is already taken
+       Entity &ForceAddEntity(std::uint32_t id);
 
-       const std::vector<Player> &Players() const noexcept { return players; }
+       const std::list<Player> &Players() const noexcept { return players; }
        std::list<Entity> &Entities() noexcept { return entities; }
        const std::list<Entity> &Entities() const noexcept { return entities; }
 
@@ -97,9 +100,8 @@ private:
        const BlockTypeRegistry &block_type;
 
        ChunkStore chunks;
-       ChunkIndex &spawn_index;
 
-       std::vector<Player> players;
+       std::list<Player> players;
        std::list<Entity> entities;
 
        glm::vec3 light_direction;