diff options
Diffstat (limited to 'StarsEx/NetLobbyServer.cpp')
| -rw-r--r-- | StarsEx/NetLobbyServer.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/StarsEx/NetLobbyServer.cpp b/StarsEx/NetLobbyServer.cpp index dfb0422..d853982 100644 --- a/StarsEx/NetLobbyServer.cpp +++ b/StarsEx/NetLobbyServer.cpp @@ -13,7 +13,11 @@ #include "NetLobbyServer.h" +#include <cstdint> + #include <InfoEx.h> +#include <List.h> +#include <Text.h> #include "NetServerConfig.h" #include "NetClientConfig.h" @@ -25,7 +29,6 @@ #include "Mission.h" #include "ShipDesign.h" #include "Sim.h" -#include "Text.h" #include "ModConfig.h" #include "ModInfo.h" @@ -57,8 +60,8 @@ NetLobbyServer::NetLobbyServer() selected_mission = 0; - Text hostname = "0.0.0.0"; - WORD server_port = 11100; + Text hostname = "0.0.0.0"; + std::uint16_t server_port = 11100; server_config = NetServerConfig::GetInstance(); if (server_config) { @@ -76,7 +79,7 @@ NetLobbyServer::NetLobbyServer() LoadMOTD(); auto game = Game::GetInstance(); - DWORD mission_id = 0; + std::uint32_t mission_id = 0; // only one mission: if (game->Server() && server_mission.length() > 0) { @@ -269,7 +272,7 @@ NetLobbyServer::ExecFrame() } auto game = Game::GetInstance(); - DWORD mission_id = 0; + std::uint32_t mission_id = 0; // restart persistent mission? if (game->Server() && game->GetGameMode() == Game::MENU_MODE && server_mission.length() > 0) { @@ -325,9 +328,9 @@ NetLobbyServer::SendData(NetUser* dst, int type, Text msg) { if (link && dst && type > 0 && type < 255) { if (msg.length()) - link->SendMessage(dst->GetNetID(), (BYTE) type, msg.data(), msg.length(), NetMsg::RELIABLE); + link->SendMessage(dst->GetNetID(), static_cast<std::uint8_t>(type), msg.data(), msg.length(), NetMsg::RELIABLE); else - link->SendMessage(dst->GetNetID(), (BYTE) type, 0, 0, NetMsg::RELIABLE); + link->SendMessage(dst->GetNetID(), static_cast<std::uint8_t>(type), 0, 0, NetMsg::RELIABLE); } } @@ -580,7 +583,7 @@ NetLobbyServer::SaveChat() // +-------------------------------------------------------------------+ void -NetLobbyServer::SelectMission(DWORD id) +NetLobbyServer::SelectMission(std::uint32_t id) { if (GetStatus() == NetServerInfo::PERSISTENT) return; @@ -834,7 +837,7 @@ NetLobbyServer::DoServerInfo(NetPeer* peer, Text s) { if (peer && peer->NetID()) { char buffer[1024]; - WORD gameport = 11101; + std::uint16_t gameport = 11101; if (server_config) gameport = server_config->GetGamePort(); @@ -847,7 +850,8 @@ NetLobbyServer::DoServerInfo(NetPeer* peer, Text s) HasHost() ? "true" : "false", gameport); - link->SendMessage(peer->NetID(), (BYTE) NET_LOBBY_SERVER_INFO, buffer, strlen(buffer), NetMsg::RELIABLE); + link->SendMessage( + peer->NetID(), static_cast<std::uint8_t>(NET_LOBBY_SERVER_INFO), buffer, strlen(buffer), NetMsg::RELIABLE); } } @@ -876,7 +880,8 @@ NetLobbyServer::DoServerMods(NetPeer* peer, Text s) response += "\" "; } - link->SendMessage(peer->NetID(), (BYTE) NET_LOBBY_SERVER_MODS, response, response.length(), NetMsg::RELIABLE); + link->SendMessage( + peer->NetID(), static_cast<std::uint8_t>(NET_LOBBY_SERVER_MODS), response, response.length(), NetMsg::RELIABLE); } } |