X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.hpp;h=771bc0c8c4fd072d8dd59c82c642828c66a30441;hb=bc35c2b12391c30c86ab8b713f456c7d8a5d701d;hp=7936f98cfd6dcec82a639454d4f8cf9f02c33f84;hpb=da21395e4900bf283ece7364c67d9bad27dca279;p=blank.git

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 7936f98..771bc0c 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -5,12 +5,13 @@
 #include "Entity.hpp"
 #include "Generator.hpp"
 #include "Player.hpp"
+#include "../graphics/glm.hpp"
+#include "../rand/GaloisLFSR.hpp"
 
 #include <cstdint>
 #include <list>
 #include <string>
 #include <vector>
-#include <glm/glm.hpp>
 
 
 namespace blank {
@@ -41,6 +42,9 @@ public:
 
 	const std::string &Name() const noexcept { return config.name; }
 
+	/// get the shared random source for this world
+	GaloisLFSR &Random() noexcept { return rng; }
+
 	/// check if this ray hits a block
 	/// depth in the collision is the distance between the ray's
 	/// origin and the intersection point
@@ -92,6 +96,14 @@ public:
 	/// 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; }
@@ -130,6 +142,8 @@ private:
 	std::list<Player> players;
 	std::list<Entity> entities;
 
+	GaloisLFSR rng;
+
 	glm::vec3 light_direction;
 	float fog_density;