Rename Networking::next_id to next_player_id

diff --git a/source/game/networking.cpp b/source/game/networking.cpp
index fdc0095a2ac9ef695f35bc7352af6946b5881962..9f60968ef90e1ddc69fb4b44708b61daad92c152 100644 (file)
--- a/source/game/networking.cpp
+++ b/source/game/networking.cpp
@@ -25,7 +25,7 @@ void Networking::start_server(unsigned port)
        server_socket->signal_data_available.connect(sigc::mem_fun(this, &Networking::incoming_connection));
        io_disp.add(*server_socket);
 
-       next_id = 1;
+       next_player_id = 1;
        set_state(SERVER);
 }
 
@@ -38,7 +38,7 @@ void Networking::connect_to_server(const string &host)
        connection = make_unique<ServerConnection>(*this, *addr);
        connection->get_communicator().signal_protocol_ready.connect(sigc::mem_fun(this, &Networking::protocol_ready));
 
-       next_id = ID_PENDING+1;
+       next_player_id = ID_PENDING+1;
        set_state(CONNECTING);
 }
 
@@ -139,7 +139,7 @@ void Networking::add_player(const string &name, function<void(unsigned)> callbac
 Networking::Player &Networking::create_player(const string &name, unsigned id)
 {
        Player &player = players.emplace_back();
-       player.id = (id ? id : next_id++);
+       player.id = (id ? id : next_player_id++);
        player.name = name;
        return player;
 }

diff --git a/source/game/networking.h b/source/game/networking.h
index b0ee36696a702cc3db64d4641ebf51878819a2e1..e459bf5c645bbf8e9e9ad7e5374b6005d0cfd581 100644 (file)
--- a/source/game/networking.h
+++ b/source/game/networking.h
@@ -95,7 +95,7 @@ private:
        std::unique_ptr<ServerConnection> connection;
        std::vector<std::unique_ptr<ClientConnection>> clients;
        std::vector<Player> players;
-       unsigned next_id = 1;
+       unsigned next_player_id = 1;
        std::vector<std::string> strings;
 
 public: