Adjust network code for changes in the mspnet library

diff --git a/source/game/networking.cpp b/source/game/networking.cpp
index 1ad4ed1e3fc5a3a285d637bcb1e5801e7f3c525f..e1bb2332cbd9bd37a11ab34bf568512e02b7220f 100644 (file)
--- a/source/game/networking.cpp
+++ b/source/game/networking.cpp
@@ -221,12 +221,12 @@ void Networking::stage_activated(const Events::StageActivated &event)
 }
 
 
-void Networking::ProxyReceiver::receive(unsigned i, const Variant &p)
+void Networking::ProxyReceiver::receive(unsigned i, Variant &&p)
 {
        if(receiver)
        {
                SetForScope set_sender(networking.current_sender, &connection);
-               receiver->receive(i, p);
+               receiver->receive(i, move(p));
        }
 }
 
@@ -281,7 +281,7 @@ void Networking::ServerConnection::connect_finished(const exception *exc)
                stale = true;
 }
 
-void Networking::ServerConnection::receive(const Messages::AddPlayerResponse &add_resp)
+void Networking::ServerConnection::receive(Messages::AddPlayerResponse &&add_resp)
 {
        auto i = find_member(networking.players, static_cast<unsigned>(add_resp.token), &Player::id);
        if(i==networking.players.end())
@@ -297,13 +297,13 @@ void Networking::ServerConnection::receive(const Messages::AddPlayerResponse &ad
        networking.event_source.emit<Events::NetworkPlayerArrived>(i->id, i->name);
 }
 
-void Networking::ServerConnection::receive(const Messages::PlayerAdded &added)
+void Networking::ServerConnection::receive(Messages::PlayerAdded &&added)
 {
        Player &player = networking.create_player(added.name, added.id);
        networking.event_source.emit<Events::NetworkPlayerArrived>(player.id, player.name);
 }
 
-void Networking::ServerConnection::receive(const Messages::PlayerRemoved &removed)
+void Networking::ServerConnection::receive(Messages::PlayerRemoved &&removed)
 {
        auto i = lower_bound_member(networking.players, static_cast<uint32_t>(removed.id), &Player::id);
        if(i!=networking.players.end())
@@ -313,14 +313,14 @@ void Networking::ServerConnection::receive(const Messages::PlayerRemoved &remove
        }
 }
 
-void Networking::ServerConnection::receive(const Messages::InternString &intern)
+void Networking::ServerConnection::receive(Messages::InternString &&intern)
 {
        if(networking.strings.size()<=intern.id)
                networking.strings.resize(intern.id+1);
        networking.strings[intern.id] = intern.value;
 }
 
-void Networking::ServerConnection::receive(const Messages::StageActivated &activated)
+void Networking::ServerConnection::receive(Messages::StageActivated &&activated)
 {
        string name = networking.get_string(activated.name);
        Stage *local_stage = networking.director.find_stage(name);
@@ -356,7 +356,7 @@ void Networking::ClientConnection::protocol_ready(const Net::Protocol &p)
        }
 }
 
-void Networking::ClientConnection::receive(const Messages::AddPlayerRequest &add_req)
+void Networking::ClientConnection::receive(Messages::AddPlayerRequest &&add_req)
 {
        Player &player = networking.create_player(add_req.name, id<<16);
        player.owner = this;
@@ -376,7 +376,7 @@ void Networking::ClientConnection::receive(const Messages::AddPlayerRequest &add
        networking.event_source.emit<Events::NetworkPlayerArrived>(player.id, player.name);
 }
 
-void Networking::ClientConnection::receive(const Messages::StageActivated &activated)
+void Networking::ClientConnection::receive(Messages::StageActivated &&activated)
 {
        const string &new_active_stage = networking.get_string(activated.name);
        if(new_active_stage==active_stage)

diff --git a/source/game/networking.h b/source/game/networking.h
index eb97a26d9da92c85250dcb1442385b34c2c4b797..ae16e8b7e9e81e87de3c5fc7560d254cfa11fcf4 100644 (file)
--- a/source/game/networking.h
+++ b/source/game/networking.h
@@ -43,7 +43,7 @@ private:
                ProxyReceiver(Networking &n, Connection &c): networking(n), connection(c) { }
 
                void set_receiver(Net::DynamicReceiver *r) { receiver = r; }
-               void receive(unsigned, const Variant &) override;
+               void receive(unsigned, Variant &&) override;
        };
 
        struct Protocol
@@ -86,11 +86,11 @@ private:
                void connect_finished(const std::exception *);
 
        public:
-               void receive(const Messages::AddPlayerResponse &) override;
-               void receive(const Messages::PlayerAdded &) override;
-               void receive(const Messages::PlayerRemoved &) override;
-               void receive(const Messages::InternString &) override;
-               void receive(const Messages::StageActivated &) override;
+               void receive(Messages::AddPlayerResponse &&) override;
+               void receive(Messages::PlayerAdded &&) override;
+               void receive(Messages::PlayerRemoved &&) override;
+               void receive(Messages::InternString &&) override;
+               void receive(Messages::StageActivated &&) override;
        };
 
        class ClientConnection: public Connection,
@@ -105,8 +105,8 @@ private:
                ClientConnection(Networking &, std::unique_ptr<Net::StreamSocket>);
 
                void protocol_ready(const Net::Protocol &);
-               void receive(const Messages::AddPlayerRequest &) override;
-               void receive(const Messages::StageActivated &) override;
+               void receive(Messages::AddPlayerRequest &&) override;
+               void receive(Messages::StageActivated &&) override;
        };
 
        struct Player

diff --git a/source/game/remotecall.h b/source/game/remotecall.h
index 07474fbd0859d9c1c3a5cf44c2e9f23c71859fdc..8b830c43b4e57b99fd4376c937203fb5f6fae4fc 100644 (file)
--- a/source/game/remotecall.h
+++ b/source/game/remotecall.h
@@ -49,7 +49,7 @@ public:
        void operator()(unsigned, P &);
 
 private:
-       void receive(const P &p) override { this->func(p); }
+       void receive(P &&p) override { this->func(p); }
 };
 
 
@@ -62,7 +62,7 @@ public:
        void operator()(P &);
 
 private:
-       void receive(const P &p) override { this->func(p); }
+       void receive(P &&p) override { this->func(p); }
 };
 
 
@@ -75,7 +75,7 @@ public:
        void operator()(Handle<E>, P &);
        void operator()(unsigned, Handle<E>, P &);
 
-       void receive(const P &p) override { this->call(p); }
+       void receive(P &&p) override { this->call(p); }
 };
 
 
@@ -87,7 +87,7 @@ public:
 
        void operator()(Handle<E>, P &);
 
-       void receive(const P &p) override { this->call(p); }
+       void receive(P &&p) override { this->call(p); }
 };
 
 

diff --git a/source/game/replicator.cpp b/source/game/replicator.cpp
index ff47330220c26822ff899e160b153ea8413a1f20..db39728bf8299e2c375e338884dfe054c3a3d80a 100644 (file)
--- a/source/game/replicator.cpp
+++ b/source/game/replicator.cpp
@@ -159,7 +159,7 @@ void Replicator::send_possession(const ReplicatedEntity &re, uint32_t target)
        send(target, grant);
 }
 
-void Replicator::receive(const Messages::SpawnEntity &message)
+void Replicator::receive(Messages::SpawnEntity &&message)
 {
        if(is_server())
                return;
@@ -174,7 +174,7 @@ void Replicator::receive(const Messages::SpawnEntity &message)
        (*i)->spawn(type_name, setup_name, TransformValues(message.position, message.rotation, message.scale));
 }
 
-void Replicator::receive(const Messages::GrantPossession &message)
+void Replicator::receive(Messages::GrantPossession &&message)
 {
        if(is_server())
                return;

diff --git a/source/game/replicator.h b/source/game/replicator.h
index 33850937406d9e0908e1a1d745a4ac4d73c331ed..6cd5e83e176a548307a15dd3748de698a9bf3512 100644 (file)
--- a/source/game/replicator.h
+++ b/source/game/replicator.h
@@ -87,8 +87,8 @@ private:
        void send_spawn(const ReplicatedEntity &, std::uint32_t);
        void send_possession(const ReplicatedEntity &, std::uint32_t);
 
-       void receive(const Messages::SpawnEntity &) override;
-       void receive(const Messages::GrantPossession &) override;
+       void receive(Messages::SpawnEntity &&) override;
+       void receive(Messages::GrantPossession &&) override;
 };
 
 template<typename T>