diff --git a/sources.cmake b/sources.cmake index 64ff8b3ad..a4c3a759b 100644 --- a/sources.cmake +++ b/sources.cmake @@ -146,17 +146,17 @@ src/network/network_string.cpp src/network/network_world.cpp src/network/protocol.cpp src/network/protocol_manager.cpp +src/network/protocols/client_lobby_room_protocol.cpp src/network/protocols/connect_to_peer.cpp src/network/protocols/connect_to_server.cpp src/network/protocols/get_peer_address.cpp src/network/protocols/get_public_address.cpp src/network/protocols/hide_public_address.cpp src/network/protocols/lobby_room_protocol.cpp -src/network/protocols/client_lobby_room_protocol.cpp -src/network/protocols/server_lobby_room_protocol.cpp src/network/protocols/ping_protocol.cpp src/network/protocols/quick_join_protocol.cpp src/network/protocols/request_connection.cpp +src/network/protocols/server_lobby_room_protocol.cpp src/network/protocols/show_public_address.cpp src/network/protocols/start_game_protocol.cpp src/network/protocols/start_server.cpp @@ -423,17 +423,17 @@ src/network/network_string.hpp src/network/network_world.hpp src/network/protocol.hpp src/network/protocol_manager.hpp +src/network/protocols/client_lobby_room_protocol.hpp src/network/protocols/connect_to_peer.hpp src/network/protocols/connect_to_server.hpp src/network/protocols/get_peer_address.hpp src/network/protocols/get_public_address.hpp src/network/protocols/hide_public_address.hpp src/network/protocols/lobby_room_protocol.hpp -src/network/protocols/client_lobby_room_protocol.hpp -src/network/protocols/server_lobby_room_protocol.hpp src/network/protocols/ping_protocol.hpp src/network/protocols/quick_join_protocol.hpp src/network/protocols/request_connection.hpp +src/network/protocols/server_lobby_room_protocol.hpp src/network/protocols/show_public_address.hpp src/network/protocols/start_game_protocol.hpp src/network/protocols/start_server.hpp diff --git a/src/network/protocols/server_lobby_room_protocol.cpp b/src/network/protocols/server_lobby_room_protocol.cpp index 40a1509ab..9973b4235 100644 --- a/src/network/protocols/server_lobby_room_protocol.cpp +++ b/src/network/protocols/server_lobby_room_protocol.cpp @@ -23,6 +23,7 @@ #include "network/protocols/show_public_address.hpp" #include "network/protocols/connect_to_peer.hpp" #include "network/protocols/start_server.hpp" +#include "network/protocols/start_game_protocol.hpp" #include "online/current_online_user.hpp" #include "online/http_connector.hpp" @@ -170,6 +171,7 @@ void ServerLobbyRoomProtocol::startGame() NetworkString ns; ns.ai8(0x04).ai8(4).ai32(peers[i]->getClientServerToken()); // start game } + m_listener->requestStart(new StartGameProtocol(m_setup)); } //-----------------------------------------------------------------------------