- Entity *AddPlayer(const std::string &name);
- Entity &AddEntity() { entities.emplace_back(); return entities.back(); }
-
- const std::vector<Entity *> &Players() const noexcept { return players; }
+ Player *AddPlayer(const std::string &name);
+ /// add player with given name and 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);
+
+ /// get the player with given name
+ /// returns nullptr if no player bears this name
+ Player *FindPlayer(const std::string &name);
+ /// get an entity with given name
+ /// returns nullptr if name doesn't refer to any entity
+ /// note that unlike players, entity names are not unique
+ Entity *FindEntity(const std::string &name);
+
+ std::list<Player> &Players() noexcept { return players; }
+ const std::list<Player> &Players() const noexcept { return players; }
+ std::list<Entity> &Entities() noexcept { return entities; }