X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.h;h=efb3b3a2472726ab8bfdce9ac5427c35a9825402;hb=b28062f2dc88e082ee5a28b2e1f7c4c8bd989023;hp=16022ba9d12664596ac4d19aec2881c8d985ca0f;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git diff --git a/source/network/server.h b/source/network/server.h index 16022ba..efb3b3a 100644 --- a/source/network/server.h +++ b/source/network/server.h @@ -4,9 +4,9 @@ #include #include #include -#include +#include #include "libr2c2/layout.h" -#include "libr2c2/trainstatus.h" +#include "libr2c2/trainai.h" #include "packets.h" #include "protocol.h" @@ -39,12 +39,14 @@ private: Protocol proto; Layout &layout; - Msp::Net::StreamListenSocket listen_sock; + Msp::Net::StreamServerSocket listen_sock; Msp::IO::EventDispatcher *event_disp; std::vector connections; public: Server(Layout &); + ~Server(); + void use_event_dispatcher(Msp::IO::EventDispatcher &); private: void incoming_connection(); @@ -54,8 +56,7 @@ private: void train_added(Train &); void train_control_changed(const Train &, const std::string &, float); void train_function_changed(const Train &, unsigned, bool); - void train_route_changed(const Train &, const Route *); - void train_status_changed(const Train &, const std::string &); + void train_ai_event(const Train &, TrainAI &, const TrainAI::Message &); template void send(const P &);