X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.h;h=402e55cd6ec1bf62507218f025fb61fbccbc45f7;hb=HEAD;hp=83be2e044da57b1a05849a74ee0ff38b9fe9829f;hpb=dec294d40194a640e7b4bccf20dd1baa4a87038c;p=r2c2.git

diff --git a/source/network/server.h b/source/network/server.h
index 83be2e0..402e55c 100644
--- a/source/network/server.h
+++ b/source/network/server.h
@@ -18,6 +18,7 @@ private:
 	struct Connection: Msp::Net::PacketReceiver<DriverStatePacket>,
 		Msp::Net::PacketReceiver<TrainControlPacket>,
 		Msp::Net::PacketReceiver<TrainFunctionPacket>,
+		Msp::Net::PacketReceiver<TrainAIControlPacket>,
 		Msp::Net::PacketReceiver<TrainRoutePacket>
 	{
 		Server &server;
@@ -33,7 +34,9 @@ private:
 		virtual void receive(const DriverStatePacket &);
 		virtual void receive(const TrainControlPacket &);
 		virtual void receive(const TrainFunctionPacket &);
+		virtual void receive(const TrainAIControlPacket &);
 		virtual void receive(const TrainRoutePacket &);
+		void comm_error(const std::exception &);
 		void error(const std::string &);
 	};
 
@@ -45,12 +48,14 @@ private:
 
 public:
 	Server(Layout &);
+	~Server();
+
 	void use_event_dispatcher(Msp::IO::EventDispatcher &);
 private:
 	void incoming_connection();
 
 	void driver_state_changed();
-	void emergency(const std::string &);
+	void emergency(Block *, const std::string &);
 	void train_added(Train &);
 	void train_control_changed(const Train &, const std::string &, float);
 	void train_function_changed(const Train &, unsigned, bool);