split input handling

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

diff --git a/src/world/World.hpp b/src/world/World.hpp
index cd631610a4367d261a0744aa0e78c7c1c6c29844..d58ad6f0d644be82ba3547a95f3dddce54c28056 100644 (file)
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -68,11 +68,11 @@ 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
@@ -82,7 +82,7 @@ public:
        /// 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; }
 
@@ -102,7 +102,7 @@ private:
        ChunkStore chunks;
        ChunkIndex &spawn_index;
 
-       std::vector<Player> players;
+       std::list<Player> players;
        std::list<Entity> entities;
 
        glm::vec3 light_direction;