X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FServer.hpp;h=c12b86aa75ba0b4d9e17e726aab2c54c44474491;hb=d5ef462f3bd70a9717c1309466ce8d90b038c5cd;hp=bf2399180111354191c2a922bfe6754c84464ac7;hpb=8fdc24f0b3fb287f5d4e1c7d1f85ad85d5ed2414;p=blank.git

diff --git a/src/server/Server.hpp b/src/server/Server.hpp
index bf23991..c12b86a 100644
--- a/src/server/Server.hpp
+++ b/src/server/Server.hpp
@@ -1,28 +1,30 @@
 #ifndef BLANK_SERVER_SERVER_HPP
 #define BLANK_SERVER_SERVER_HPP
 
+#include "../app/Config.hpp"
+#include "../world/World.hpp"
+#include "../world/WorldManipulator.hpp"
+
 #include <list>
 #include <SDL_net.h>
 
 
 namespace blank {
 
+class ChunkIndex;
 class CompositeModel;
-class World;
+class Player;
+class WorldSave;
 
 namespace server {
 
 class ClientConnection;
 
-class Server {
-
-public:
-	struct Config {
-		Uint16 port = 12354;
-	};
+class Server
+: public WorldManipulator {
 
 public:
-	Server(const Config &, World &);
+	Server(const Config::Network &, World &, const World::Config &, const WorldSave &);
 	~Server();
 
 	void Handle();
@@ -33,11 +35,16 @@ public:
 	UDPpacket &GetPacket() noexcept { return serv_pack; }
 
 	World &GetWorld() noexcept { return world; }
+	const WorldSave &GetWorldSave() noexcept { return save; }
 
 	void SetPlayerModel(const CompositeModel &) noexcept;
 	bool HasPlayerModel() const noexcept;
 	const CompositeModel &GetPlayerModel() const noexcept;
 
+	Player *JoinPlayer(const std::string &name);
+
+	void SetBlock(Chunk &, int, const Block &) override;
+
 private:
 	void HandlePacket(const UDPpacket &);
 
@@ -49,6 +56,8 @@ private:
 	std::list<ClientConnection> clients;
 
 	World &world;
+	ChunkIndex &spawn_index;
+	const WorldSave &save;
 	const CompositeModel *player_model;
 
 };