X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FServer.hpp;h=f81c9cea205b4918edfbb26e4da3c1357402baa4;hb=b07f3c123fff221edeffb4864bab7db88d0d1f4d;hp=372a947ef65fe0e14c1aa209d091036fcd47ed6b;hpb=a50aa0f2a2fea14f5f8c56209e2ecde3088ef913;p=blank.git

diff --git a/src/server/Server.hpp b/src/server/Server.hpp
index 372a947..f81c9ce 100644
--- a/src/server/Server.hpp
+++ b/src/server/Server.hpp
@@ -2,16 +2,23 @@
 #define BLANK_SERVER_SERVER_HPP
 
 #include "../app/Config.hpp"
+#include "../shared/CLI.hpp"
+#include "../world/World.hpp"
 #include "../world/WorldManipulator.hpp"
 
+#include <cstdint>
+#include <memory>
 #include <list>
 #include <SDL_net.h>
 
 
 namespace blank {
 
-class CompositeModel;
-class World;
+class ChunkIndex;
+class CLIContext;
+class CommandService;
+class Model;
+class Player;
 class WorldSave;
 
 namespace server {
@@ -22,9 +29,13 @@ class Server
 : public WorldManipulator {
 
 public:
-	Server(const Config::Network &, World &, const WorldSave &);
+	Server(const Config::Network &, World &, const World::Config &, const WorldSave &);
 	~Server();
 
+	// wait for data to arrive for at most dt milliseconds
+	void Wait(int dt) noexcept;
+	// true if there's data waiting to be handled
+	bool Ready() noexcept;
 	void Handle();
 
 	void Update(int dt);
@@ -35,25 +46,40 @@ public:
 	World &GetWorld() noexcept { return world; }
 	const WorldSave &GetWorldSave() noexcept { return save; }
 
-	void SetPlayerModel(const CompositeModel &) noexcept;
+	void SetPlayerModel(const Model &) noexcept;
 	bool HasPlayerModel() const noexcept;
-	const CompositeModel &GetPlayerModel() const noexcept;
+	const Model &GetPlayerModel() const noexcept;
+
+	Player *JoinPlayer(const std::string &name);
 
 	void SetBlock(Chunk &, int, const Block &) override;
 
+	/// for use by client connections when they receive a line from the player
+	void DispatchMessage(CLIContext &, const std::string &);
+
+	/// send message to all connected clients
+	void DistributeMessage(std::uint8_t type, std::uint32_t ref, const std::string &msg);
+
 private:
 	void HandlePacket(const UDPpacket &);
 
 	ClientConnection &GetClient(const IPaddress &);
 
+	void SendAll();
+
 private:
 	UDPsocket serv_sock;
 	UDPpacket serv_pack;
+	SDLNet_SocketSet serv_set;
 	std::list<ClientConnection> clients;
 
 	World &world;
+	ChunkIndex &spawn_index;
 	const WorldSave &save;
-	const CompositeModel *player_model;
+	const Model *player_model;
+
+	CLI cli;
+	std::unique_ptr<CommandService> cmd_srv;
 
 };