X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.h;h=dc7543fe293278f09be6fb673731108500bae8bf;hb=251270c97a5e5eb8630bc1662a406255dedae90e;hp=ced08aac06eb2df544a9dd8e741cf6cdcfc75e2f;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git diff --git a/source/network/server.h b/source/network/server.h index ced08aa..dc7543f 100644 --- a/source/network/server.h +++ b/source/network/server.h @@ -21,9 +21,10 @@ namespace R2C2 { class Server { private: - struct Connection: private Msp::Net::PacketReceiver, - private Msp::Net::PacketReceiver, - private Msp::Net::PacketReceiver + struct Connection: Msp::Net::PacketReceiver, + Msp::Net::PacketReceiver, + Msp::Net::PacketReceiver, + Msp::Net::PacketReceiver { Server &server; Msp::Net::StreamSocket *socket; @@ -35,6 +36,7 @@ private: void handshake_done(); void end_of_file(); + virtual void receive(const DriverStatePacket &); virtual void receive(const TrainControlPacket &); virtual void receive(const TrainFunctionPacket &); virtual void receive(const TrainRoutePacket &); @@ -53,6 +55,8 @@ public: private: void incoming_connection(); + void driver_state_changed(); + void emergency(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);