From 281e8cd862b14361061b2840bbf0bcc7f9a7f4cf Mon Sep 17 00:00:00 2001 From: phosit Date: Wed, 9 Sep 2026 09:59:47 +0200 Subject: [PATCH] Remove uint It's better to use the native types. --- source/graphics/Font.cpp | 6 +- source/gui/Scripting/JSInterface_CGUISize.cpp | 3 +- source/gui/Scripting/JSInterface_GUISize.cpp | 4 +- source/gui/Scripting/JSInterface_GUISize.h | 5 +- source/lib/types.h | 2 - source/network/NetClient.cpp | 174 +++++++++++------- source/network/NetServer.cpp | 128 ++++++++----- source/network/NetServerSession.cpp | 2 +- source/network/tests/test_Net.h | 2 +- source/ps/Hotkey.h | 13 +- source/scriptinterface/Interface.cpp | 17 +- source/scriptinterface/Interface.h | 6 +- source/scriptinterface/Object.h | 3 +- .../serialization/BinarySerializer.cpp | 2 +- source/simulation2/system/TurnManager.h | 3 +- 15 files changed, 214 insertions(+), 156 deletions(-) diff --git a/source/graphics/Font.cpp b/source/graphics/Font.cpp index f45d7feaca..1724edc0dd 100644 --- a/source/graphics/Font.cpp +++ b/source/graphics/Font.cpp @@ -536,12 +536,12 @@ void CFont::BlendGlyphBitmapToTexture(const FT_Bitmap& bitmap, int targetX, int void CFont::BlendGlyphBitmapToTextureRGBA(const FT_Bitmap& bitmap, int targetX, int targetY, std::uint8_t r, std::uint8_t g, std::uint8_t b) { - for (uint y{0}; y != bitmap.rows; ++y) + for (unsigned int y{0}; y != bitmap.rows; ++y) { const std::uint8_t* srcRow{bitmap.buffer + y * bitmap.pitch}; std::uint8_t* dstRow{m_TexData.get() + ((targetY + y) * m_AtlasWidth + targetX) * m_TextureFormatStride}; - for (uint x{0}; x != bitmap.width; ++x) + for (unsigned int x{0}; x != bitmap.width; ++x) { std::uint8_t* tempDstRow{dstRow + x * m_TextureFormatStride}; std::uint8_t alpha{srcRow[x]}; @@ -566,7 +566,7 @@ void CFont::BlendGlyphBitmapToTextureRGBA(const FT_Bitmap& bitmap, int targetX, void CFont::BlendGlyphBitmapToTextureR8(const FT_Bitmap& bitmap, int targetX, int targetY) { - for (uint y{0}; y != bitmap.rows; ++y) + for (unsigned int y{0}; y != bitmap.rows; ++y) { const std::uint8_t* srcRow{bitmap.buffer + y * bitmap.pitch}; std::uint8_t* dstRow{m_TexData.get() + ((targetY + y) * m_AtlasWidth + targetX)}; diff --git a/source/gui/Scripting/JSInterface_CGUISize.cpp b/source/gui/Scripting/JSInterface_CGUISize.cpp index fa1df5ac94..d7a872b3e6 100644 --- a/source/gui/Scripting/JSInterface_CGUISize.cpp +++ b/source/gui/Scripting/JSInterface_CGUISize.cpp @@ -25,7 +25,6 @@ #include "gui/Scripting/JSInterface_GUISize.h" #include "gui/SettingTypes/CGUISize.h" #include "lib/code_generation.h" -#include "lib/types.h" #include "maths/Rect.h" #include "ps/CLogger.h" #include "ps/CStr.h" @@ -92,7 +91,7 @@ std::string ToPercentString(double pix, double per) return fmt::format("{}%{:+}", per, pix); } -bool toString(JSContext* cx, uint argc, JS::Value* vp) +bool toString(JSContext* cx, unsigned int argc, JS::Value* vp) { JS::CallArgs args{JS::CallArgsFromVp(argc, vp)}; JS::RootedObject obj{cx, &args.thisv().toObject()}; diff --git a/source/gui/Scripting/JSInterface_GUISize.cpp b/source/gui/Scripting/JSInterface_GUISize.cpp index 9656328fef..bf5b1d0887 100644 --- a/source/gui/Scripting/JSInterface_GUISize.cpp +++ b/source/gui/Scripting/JSInterface_GUISize.cpp @@ -57,7 +57,7 @@ void JSI_GUISize::RegisterScriptClass(Script::Interface& scriptInterface) scriptInterface.DefineCustomObjectType(&JSI_GUISize::JSI_class, JSI_GUISize::construct, 0, nullptr, JSI_GUISize::JSI_methods, nullptr, nullptr); } -bool JSI_GUISize::construct(JSContext* cx, uint argc, JS::Value* vp) +bool JSI_GUISize::construct(JSContext* cx, unsigned int argc, JS::Value* vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); Script::Request rq(cx); @@ -117,7 +117,7 @@ std::string JSI_GUISize::ToPercentString(double pix, double per) return fmt::format("{}%{:+}", per, pix); } -bool JSI_GUISize::toString(JSContext* cx, uint argc, JS::Value* vp) +bool JSI_GUISize::toString(JSContext* cx, unsigned int argc, JS::Value* vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); std::string buffer; diff --git a/source/gui/Scripting/JSInterface_GUISize.h b/source/gui/Scripting/JSInterface_GUISize.h index a3dc798a23..02ec1b9f43 100644 --- a/source/gui/Scripting/JSInterface_GUISize.h +++ b/source/gui/Scripting/JSInterface_GUISize.h @@ -20,7 +20,6 @@ #include "lib/posix/posix_types.h" -#include "lib/types.h" #include @@ -41,8 +40,8 @@ namespace JSI_GUISize void RegisterScriptClass(Script::Interface& scriptInterface); - bool construct(JSContext* cx, uint argc, JS::Value* vp); - bool toString(JSContext* cx, uint argc, JS::Value* vp); + bool construct(JSContext* cx, unsigned int argc, JS::Value* vp); + bool toString(JSContext* cx, unsigned int argc, JS::Value* vp); std::string ToPercentString(double pix, double per); } diff --git a/source/lib/types.h b/source/lib/types.h index fa53333cf4..d827dfea60 100644 --- a/source/lib/types.h +++ b/source/lib/types.h @@ -29,6 +29,4 @@ #include -typedef unsigned int uint; - #endif // #ifndef INCLUDED_TYPES diff --git a/source/network/NetClient.cpp b/source/network/NetClient.cpp index dffad3afba..3261563a04 100644 --- a/source/network/NetClient.cpp +++ b/source/network/NetClient.cpp @@ -91,60 +91,96 @@ CNetClient::CNetClient(PrivateTag, CGame* game, std::string serverAddressOrHostn m_Game->SetTurnManager(NULL); // delete the old local turn manager so we don't accidentally use it // Set up transitions for session - AddTransition(NCS_UNCONNECTED, (uint)NMT_CONNECT_COMPLETE, NCS_CONNECT, &OnConnect, this); + AddTransition(NCS_UNCONNECTED, static_cast(NMT_CONNECT_COMPLETE), NCS_CONNECT, + &OnConnect, this); - AddTransition(NCS_CONNECT, (uint)NMT_SERVER_HANDSHAKE, NCS_HANDSHAKE, &OnHandshake, this); + AddTransition(NCS_CONNECT, static_cast(NMT_SERVER_HANDSHAKE), NCS_HANDSHAKE, + &OnHandshake, this); - AddTransition(NCS_HANDSHAKE, (uint)NMT_SERVER_HANDSHAKE_RESPONSE, NCS_AUTHENTICATE, &OnHandshakeResponse, this); + AddTransition(NCS_HANDSHAKE, static_cast(NMT_SERVER_HANDSHAKE_RESPONSE), + NCS_AUTHENTICATE, &OnHandshakeResponse, this); - AddTransition(NCS_AUTHENTICATE, (uint)NMT_AUTHENTICATE, NCS_AUTHENTICATE, &OnAuthenticateRequest, this); - AddTransition(NCS_AUTHENTICATE, (uint)NMT_AUTHENTICATE_RESULT, NCS_PREGAME, &OnAuthenticate, this); + AddTransition(NCS_AUTHENTICATE, static_cast(NMT_AUTHENTICATE), NCS_AUTHENTICATE, + &OnAuthenticateRequest, this); + AddTransition(NCS_AUTHENTICATE, static_cast(NMT_AUTHENTICATE_RESULT), NCS_PREGAME, + &OnAuthenticate, this); - AddTransition(NCS_PREGAME, (uint)NMT_CHAT, NCS_PREGAME, &OnChat, this); - AddTransition(NCS_PREGAME, (uint)NMT_READY, NCS_PREGAME, &OnReady, this); - AddTransition(NCS_PREGAME, (uint)NMT_GAME_SETUP, NCS_PREGAME, &OnGameSetup, this); - AddTransition(NCS_PREGAME, (uint)NMT_PLAYER_ASSIGNMENT, NCS_PREGAME, &OnPlayerAssignment, this); - AddTransition(NCS_PREGAME, (uint)NMT_KICKED, NCS_PREGAME, &OnKicked, this); - AddTransition(NCS_PREGAME, (uint)NMT_CLIENT_TIMEOUT, NCS_PREGAME, &OnClientTimeout, this); - AddTransition(NCS_PREGAME, (uint)NMT_CLIENT_PERFORMANCE, NCS_PREGAME, &OnClientPerformance, this); - AddTransition(NCS_PREGAME, (uint)NMT_GAME_START, NCS_LOADING, &OnGameStart, this); - AddTransition(NCS_PREGAME, (uint)NMT_SAVED_GAME_START, NCS_LOADING, &OnSavedGameStart, this); - AddTransition(NCS_PREGAME, (uint)NMT_JOIN_SYNC_START, NCS_JOIN_SYNCING, &OnJoinSyncStart, this); + AddTransition(NCS_PREGAME, static_cast(NMT_CHAT), NCS_PREGAME, &OnChat, this); + AddTransition(NCS_PREGAME, static_cast(NMT_READY), NCS_PREGAME, &OnReady, this); + AddTransition(NCS_PREGAME, static_cast(NMT_GAME_SETUP), NCS_PREGAME, &OnGameSetup, + this); + AddTransition(NCS_PREGAME, static_cast(NMT_PLAYER_ASSIGNMENT), NCS_PREGAME, + &OnPlayerAssignment, this); + AddTransition(NCS_PREGAME, static_cast(NMT_KICKED), NCS_PREGAME, &OnKicked, this); + AddTransition(NCS_PREGAME, static_cast(NMT_CLIENT_TIMEOUT), NCS_PREGAME, + &OnClientTimeout, this); + AddTransition(NCS_PREGAME, static_cast(NMT_CLIENT_PERFORMANCE), NCS_PREGAME, + &OnClientPerformance, this); + AddTransition(NCS_PREGAME, static_cast(NMT_GAME_START), NCS_LOADING, &OnGameStart, + this); + AddTransition(NCS_PREGAME, static_cast(NMT_SAVED_GAME_START), NCS_LOADING, + &OnSavedGameStart, this); + AddTransition(NCS_PREGAME, static_cast(NMT_JOIN_SYNC_START), NCS_JOIN_SYNCING, + &OnJoinSyncStart, this); - AddTransition(NCS_JOIN_SYNCING, (uint)NMT_CHAT, NCS_JOIN_SYNCING, &OnChat, this); - AddTransition(NCS_JOIN_SYNCING, (uint)NMT_GAME_SETUP, NCS_JOIN_SYNCING, &OnGameSetup, this); - AddTransition(NCS_JOIN_SYNCING, (uint)NMT_PLAYER_ASSIGNMENT, NCS_JOIN_SYNCING, &OnPlayerAssignment, this); - AddTransition(NCS_JOIN_SYNCING, (uint)NMT_KICKED, NCS_JOIN_SYNCING, &OnKicked, this); - AddTransition(NCS_JOIN_SYNCING, (uint)NMT_CLIENT_TIMEOUT, NCS_JOIN_SYNCING, &OnClientTimeout, this); - AddTransition(NCS_JOIN_SYNCING, (uint)NMT_CLIENT_PERFORMANCE, NCS_JOIN_SYNCING, &OnClientPerformance, this); - AddTransition(NCS_JOIN_SYNCING, (uint)NMT_GAME_START, NCS_JOIN_SYNCING, &OnGameStart, this); - AddTransition(NCS_JOIN_SYNCING, (uint)NMT_SAVED_GAME_START, NCS_LOADING, &OnSavedGameStart, this); - AddTransition(NCS_JOIN_SYNCING, (uint)NMT_SIMULATION_COMMAND, NCS_JOIN_SYNCING, &OnInGame, this); - AddTransition(NCS_JOIN_SYNCING, (uint)NMT_END_COMMAND_BATCH, NCS_JOIN_SYNCING, &OnJoinSyncEndCommandBatch, this); - AddTransition(NCS_JOIN_SYNCING, (uint)NMT_LOADED_GAME, NCS_INGAME, &OnLoadedGame, this); + AddTransition(NCS_JOIN_SYNCING, static_cast(NMT_CHAT), NCS_JOIN_SYNCING, &OnChat, + this); + AddTransition(NCS_JOIN_SYNCING, static_cast(NMT_GAME_SETUP), NCS_JOIN_SYNCING, + &OnGameSetup, this); + AddTransition(NCS_JOIN_SYNCING, static_cast(NMT_PLAYER_ASSIGNMENT), NCS_JOIN_SYNCING, + &OnPlayerAssignment, this); + AddTransition(NCS_JOIN_SYNCING, static_cast(NMT_KICKED), NCS_JOIN_SYNCING, &OnKicked, + this); + AddTransition(NCS_JOIN_SYNCING, static_cast(NMT_CLIENT_TIMEOUT), NCS_JOIN_SYNCING, + &OnClientTimeout, this); + AddTransition(NCS_JOIN_SYNCING, static_cast(NMT_CLIENT_PERFORMANCE), NCS_JOIN_SYNCING, + &OnClientPerformance, this); + AddTransition(NCS_JOIN_SYNCING, static_cast(NMT_GAME_START), NCS_JOIN_SYNCING, + &OnGameStart, this); + AddTransition(NCS_JOIN_SYNCING, static_cast(NMT_SAVED_GAME_START), NCS_LOADING, + &OnSavedGameStart, this); + AddTransition(NCS_JOIN_SYNCING, static_cast(NMT_SIMULATION_COMMAND), NCS_JOIN_SYNCING, + &OnInGame, this); + AddTransition(NCS_JOIN_SYNCING, static_cast(NMT_END_COMMAND_BATCH), NCS_JOIN_SYNCING, + &OnJoinSyncEndCommandBatch, this); + AddTransition(NCS_JOIN_SYNCING, static_cast(NMT_LOADED_GAME), NCS_INGAME, + &OnLoadedGame, this); - AddTransition(NCS_LOADING, (uint)NMT_CHAT, NCS_LOADING, &OnChat, this); - AddTransition(NCS_LOADING, (uint)NMT_GAME_SETUP, NCS_LOADING, &OnGameSetup, this); - AddTransition(NCS_LOADING, (uint)NMT_PLAYER_ASSIGNMENT, NCS_LOADING, &OnPlayerAssignment, this); - AddTransition(NCS_LOADING, (uint)NMT_KICKED, NCS_LOADING, &OnKicked, this); - AddTransition(NCS_LOADING, (uint)NMT_CLIENT_TIMEOUT, NCS_LOADING, &OnClientTimeout, this); - AddTransition(NCS_LOADING, (uint)NMT_CLIENT_PERFORMANCE, NCS_LOADING, &OnClientPerformance, this); - AddTransition(NCS_LOADING, (uint)NMT_CLIENTS_LOADING, NCS_LOADING, &OnClientsLoading, this); - AddTransition(NCS_LOADING, (uint)NMT_LOADED_GAME, NCS_INGAME, &OnLoadedGame, this); + AddTransition(NCS_LOADING, static_cast(NMT_CHAT), NCS_LOADING, &OnChat, this); + AddTransition(NCS_LOADING, static_cast(NMT_GAME_SETUP), NCS_LOADING, &OnGameSetup, + this); + AddTransition(NCS_LOADING, static_cast(NMT_PLAYER_ASSIGNMENT), NCS_LOADING, + &OnPlayerAssignment, this); + AddTransition(NCS_LOADING, static_cast(NMT_KICKED), NCS_LOADING, &OnKicked, this); + AddTransition(NCS_LOADING, static_cast(NMT_CLIENT_TIMEOUT), NCS_LOADING, + &OnClientTimeout, this); + AddTransition(NCS_LOADING, static_cast(NMT_CLIENT_PERFORMANCE), NCS_LOADING, + &OnClientPerformance, this); + AddTransition(NCS_LOADING, static_cast(NMT_CLIENTS_LOADING), NCS_LOADING, + &OnClientsLoading, this); + AddTransition(NCS_LOADING, static_cast(NMT_LOADED_GAME), NCS_INGAME, &OnLoadedGame, + this); - AddTransition(NCS_INGAME, (uint)NMT_REJOINED, NCS_INGAME, &OnRejoined, this); - AddTransition(NCS_INGAME, (uint)NMT_KICKED, NCS_INGAME, &OnKicked, this); - AddTransition(NCS_INGAME, (uint)NMT_CLIENT_TIMEOUT, NCS_INGAME, &OnClientTimeout, this); - AddTransition(NCS_INGAME, (uint)NMT_CLIENT_PERFORMANCE, NCS_INGAME, &OnClientPerformance, this); - AddTransition(NCS_INGAME, (uint)NMT_CLIENTS_LOADING, NCS_INGAME, &OnClientsLoading, this); - AddTransition(NCS_INGAME, (uint)NMT_CLIENT_PAUSED, NCS_INGAME, &OnClientPaused, this); - AddTransition(NCS_INGAME, (uint)NMT_CHAT, NCS_INGAME, &OnChat, this); - AddTransition(NCS_INGAME, (uint)NMT_GAME_SETUP, NCS_INGAME, &OnGameSetup, this); - AddTransition(NCS_INGAME, (uint)NMT_PLAYER_ASSIGNMENT, NCS_INGAME, &OnPlayerAssignment, this); - AddTransition(NCS_INGAME, (uint)NMT_SIMULATION_COMMAND, NCS_INGAME, &OnInGame, this); - AddTransition(NCS_INGAME, (uint)NMT_FLARE, NCS_INGAME, &OnFlare, this); - AddTransition(NCS_INGAME, (uint)NMT_SYNC_ERROR, NCS_INGAME, &OnInGame, this); - AddTransition(NCS_INGAME, (uint)NMT_END_COMMAND_BATCH, NCS_INGAME, &OnInGame, this); + AddTransition(NCS_INGAME, static_cast(NMT_REJOINED), NCS_INGAME, &OnRejoined, this); + AddTransition(NCS_INGAME, static_cast(NMT_KICKED), NCS_INGAME, &OnKicked, this); + AddTransition(NCS_INGAME, static_cast(NMT_CLIENT_TIMEOUT), NCS_INGAME, + &OnClientTimeout, this); + AddTransition(NCS_INGAME, static_cast(NMT_CLIENT_PERFORMANCE), NCS_INGAME, + &OnClientPerformance, this); + AddTransition(NCS_INGAME, static_cast(NMT_CLIENTS_LOADING), NCS_INGAME, + &OnClientsLoading, this); + AddTransition(NCS_INGAME, static_cast(NMT_CLIENT_PAUSED), NCS_INGAME, &OnClientPaused, + this); + AddTransition(NCS_INGAME, static_cast(NMT_CHAT), NCS_INGAME, &OnChat, this); + AddTransition(NCS_INGAME, static_cast(NMT_GAME_SETUP), NCS_INGAME, &OnGameSetup, this); + AddTransition(NCS_INGAME, static_cast(NMT_PLAYER_ASSIGNMENT), NCS_INGAME, + &OnPlayerAssignment, this); + AddTransition(NCS_INGAME, static_cast(NMT_SIMULATION_COMMAND), NCS_INGAME, &OnInGame, + this); + AddTransition(NCS_INGAME, static_cast(NMT_FLARE), NCS_INGAME, &OnFlare, this); + AddTransition(NCS_INGAME, static_cast(NMT_SYNC_ERROR), NCS_INGAME, &OnInGame, this); + AddTransition(NCS_INGAME, static_cast(NMT_END_COMMAND_BATCH), NCS_INGAME, &OnInGame, + this); // Set first state SetFirstState(NCS_UNCONNECTED); @@ -463,7 +499,7 @@ bool CNetClient::SendMessage(const CNetMessage* message) void CNetClient::HandleConnect() { - Update((uint)NMT_CONNECT_COMPLETE, NULL); + Update(static_cast(NMT_CONNECT_COMPLETE), nullptr); } void CNetClient::HandleDisconnect(std::uint32_t reason) @@ -686,7 +722,7 @@ void CNetClient::StartGame(const JS::MutableHandleValue initAttributes, const st bool CNetClient::OnConnect(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_CONNECT_COMPLETE); + ENSURE(event->GetType() == static_cast(NMT_CONNECT_COMPLETE)); client->PushGuiMessage( "type", "netstatus", @@ -697,7 +733,7 @@ bool CNetClient::OnConnect(CNetClient* client, CFsmEvent* event) bool CNetClient::OnHandshake(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_SERVER_HANDSHAKE); + ENSURE(event->GetType() == static_cast(NMT_SERVER_HANDSHAKE)); client->m_ServerHandshake = *static_cast(event->GetParamRef()); CCliHandshakeMessage handshake(CreateHandshake()); @@ -708,7 +744,7 @@ bool CNetClient::OnHandshake(CNetClient* client, CFsmEvent* event) bool CNetClient::OnHandshakeResponse(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_SERVER_HANDSHAKE_RESPONSE); + ENSURE(event->GetType() == static_cast(NMT_SERVER_HANDSHAKE_RESPONSE)); CSrvHandshakeResponseMessage* message = static_cast(event->GetParamRef()); @@ -736,7 +772,7 @@ bool CNetClient::OnHandshakeResponse(CNetClient* client, CFsmEvent bool CNetClient::OnAuthenticateRequest(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_AUTHENTICATE); + ENSURE(event->GetType() == static_cast(NMT_AUTHENTICATE)); client->SendAuthenticateMessage(); return true; @@ -744,7 +780,7 @@ bool CNetClient::OnAuthenticateRequest(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_AUTHENTICATE_RESULT); + ENSURE(event->GetType() == static_cast(NMT_AUTHENTICATE_RESULT)); CAuthenticateResultMessage* message = static_cast(event->GetParamRef()); @@ -765,7 +801,7 @@ bool CNetClient::OnAuthenticate(CNetClient* client, CFsmEvent* eve bool CNetClient::OnChat(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_CHAT); + ENSURE(event->GetType() == static_cast(NMT_CHAT)); CChatMessage* message = static_cast(event->GetParamRef()); @@ -779,7 +815,7 @@ bool CNetClient::OnChat(CNetClient* client, CFsmEvent* event) bool CNetClient::OnReady(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_READY); + ENSURE(event->GetType() == static_cast(NMT_READY)); CReadyMessage* message = static_cast(event->GetParamRef()); @@ -793,7 +829,7 @@ bool CNetClient::OnReady(CNetClient* client, CFsmEvent* event) bool CNetClient::OnGameSetup(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_GAME_SETUP); + ENSURE(event->GetType() == static_cast(NMT_GAME_SETUP)); CGameSetupMessage* message = static_cast(event->GetParamRef()); @@ -806,7 +842,7 @@ bool CNetClient::OnGameSetup(CNetClient* client, CFsmEvent* event) bool CNetClient::OnPlayerAssignment(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_PLAYER_ASSIGNMENT); + ENSURE(event->GetType() == static_cast(NMT_PLAYER_ASSIGNMENT)); CPlayerAssignmentMessage* message = static_cast(event->GetParamRef()); @@ -833,7 +869,7 @@ bool CNetClient::OnPlayerAssignment(CNetClient* client, CFsmEvent* // if this client rejoins and finishes the download of the simstate. bool CNetClient::OnGameStart(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_GAME_START); + ENSURE(event->GetType() == static_cast(NMT_GAME_START)); CGameStartMessage* message = static_cast(event->GetParamRef()); @@ -849,7 +885,7 @@ bool CNetClient::OnGameStart(CNetClient* client, CFsmEvent* event) bool CNetClient::OnSavedGameStart(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == static_cast(NMT_SAVED_GAME_START)); + ENSURE(event->GetType() == static_cast(NMT_SAVED_GAME_START)); CGameSavedStartMessage* message{static_cast(event->GetParamRef())}; const Script::Interface& scriptInterface{client->m_Game->GetSimulation2()->GetScriptInterface()}; @@ -870,7 +906,7 @@ bool CNetClient::OnSavedGameStart(CNetClient* client, CFsmEvent* e bool CNetClient::OnJoinSyncStart(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_JOIN_SYNC_START); + ENSURE(event->GetType() == static_cast(NMT_JOIN_SYNC_START)); CJoinSyncStartMessage* joinSyncStartMessage = (CJoinSyncStartMessage*)event->GetParamRef(); @@ -895,7 +931,7 @@ bool CNetClient::OnJoinSyncStart(CNetClient* client, CFsmEvent* ev bool CNetClient::OnJoinSyncEndCommandBatch(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_END_COMMAND_BATCH); + ENSURE(event->GetType() == static_cast(NMT_END_COMMAND_BATCH)); CEndCommandBatchMessage* endMessage = (CEndCommandBatchMessage*)event->GetParamRef(); @@ -909,7 +945,7 @@ bool CNetClient::OnJoinSyncEndCommandBatch(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_REJOINED); + ENSURE(event->GetType() == static_cast(NMT_REJOINED)); CRejoinedMessage* message = static_cast(event->GetParamRef()); @@ -922,7 +958,7 @@ bool CNetClient::OnRejoined(CNetClient* client, CFsmEvent* event) bool CNetClient::OnKicked(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_KICKED); + ENSURE(event->GetType() == static_cast(NMT_KICKED)); CKickedMessage* message = static_cast(event->GetParamRef()); @@ -938,7 +974,7 @@ bool CNetClient::OnClientTimeout(CNetClient* client, CFsmEvent* ev { // Report the timeout of some other client - ENSURE(event->GetType() == (uint)NMT_CLIENT_TIMEOUT); + ENSURE(event->GetType() == static_cast(NMT_CLIENT_TIMEOUT)); CClientTimeoutMessage* message = static_cast(event->GetParamRef()); @@ -955,7 +991,7 @@ bool CNetClient::OnClientPerformance(CNetClient* client, CFsmEvent { // Performance statistics for one or multiple clients - ENSURE(event->GetType() == (uint)NMT_CLIENT_PERFORMANCE); + ENSURE(event->GetType() == static_cast(NMT_CLIENT_PERFORMANCE)); CClientPerformanceMessage* message = static_cast(event->GetParamRef()); @@ -977,7 +1013,7 @@ bool CNetClient::OnClientPerformance(CNetClient* client, CFsmEvent bool CNetClient::OnClientsLoading(CNetClient* client, CFsmEvent *event) { - ENSURE(event->GetType() == (uint)NMT_CLIENTS_LOADING); + ENSURE(event->GetType() == static_cast(NMT_CLIENTS_LOADING)); CClientsLoadingMessage* message = static_cast(event->GetParamRef()); @@ -994,7 +1030,7 @@ bool CNetClient::OnClientsLoading(CNetClient* client, CFsmEvent *e bool CNetClient::OnClientPaused(CNetClient* client, CFsmEvent *event) { - ENSURE(event->GetType() == (uint)NMT_CLIENT_PAUSED); + ENSURE(event->GetType() == static_cast(NMT_CLIENT_PAUSED)); CClientPausedMessage* message = static_cast(event->GetParamRef()); @@ -1008,7 +1044,7 @@ bool CNetClient::OnClientPaused(CNetClient* client, CFsmEvent *eve bool CNetClient::OnLoadedGame(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_LOADED_GAME); + ENSURE(event->GetType() == static_cast(NMT_LOADED_GAME)); // All players have loaded the game - start running the turn manager // so that the game begins @@ -1055,7 +1091,7 @@ bool CNetClient::OnInGame(CNetClient* client, CFsmEvent* event) bool CNetClient::OnFlare(CNetClient* client, CFsmEvent* event) { - ENSURE(event->GetType() == static_cast(NMT_FLARE)); + ENSURE(event->GetType() == static_cast(NMT_FLARE)); CFlareMessage* message = static_cast(event->GetParamRef()); diff --git a/source/network/NetServer.cpp b/source/network/NetServer.cpp index c429d2c5c9..6d6799dbc4 100644 --- a/source/network/NetServer.cpp +++ b/source/network/NetServer.cpp @@ -24,7 +24,6 @@ #include "lib/external_libraries/enet.h" #include "lib/secure_crt.h" #include "lib/status.h" -#include "lib/types.h" #include "lib/utf8.h" #include "network/FSM.h" #include "network/NetEnet.h" @@ -507,7 +506,7 @@ bool CNetServerWorker::RunStep() const std::unique_ptr _ = std::move(*iter); m_Sessions.erase(iter); - session->Update((uint)NMT_CONNECTION_LOST, NULL); + session->Update(static_cast(NMT_CONNECTION_LOST), nullptr); event.peer->data = NULL; } @@ -636,41 +635,70 @@ void CNetServerWorker::SetupSession(CNetServerSession* session) { // Set up transitions for session - session->AddTransition(NSS_UNCONNECTED, (uint)NMT_CONNECTION_LOST, NSS_UNCONNECTED); + session->AddTransition(NSS_UNCONNECTED, static_cast(NMT_CONNECTION_LOST), + NSS_UNCONNECTED); - session->AddTransition(NSS_HANDSHAKE, (uint)NMT_CONNECTION_LOST, NSS_UNCONNECTED); - session->AddTransition(NSS_HANDSHAKE, (uint)NMT_CLIENT_HANDSHAKE, NSS_AUTHENTICATE, &OnClientHandshake, session); + session->AddTransition(NSS_HANDSHAKE, static_cast(NMT_CONNECTION_LOST), + NSS_UNCONNECTED); + session->AddTransition(NSS_HANDSHAKE, static_cast(NMT_CLIENT_HANDSHAKE), + NSS_AUTHENTICATE, &OnClientHandshake, session); - session->AddTransition(NSS_LOBBY_AUTHENTICATE, (uint)NMT_CONNECTION_LOST, NSS_UNCONNECTED); - session->AddTransition(NSS_LOBBY_AUTHENTICATE, (uint)NMT_AUTHENTICATE, NSS_PREGAME, &OnAuthenticate, session); + session->AddTransition(NSS_LOBBY_AUTHENTICATE, static_cast(NMT_CONNECTION_LOST), + NSS_UNCONNECTED); + session->AddTransition(NSS_LOBBY_AUTHENTICATE, static_cast(NMT_AUTHENTICATE), + NSS_PREGAME, &OnAuthenticate, session); - session->AddTransition(NSS_AUTHENTICATE, (uint)NMT_CONNECTION_LOST, NSS_UNCONNECTED); - session->AddTransition(NSS_AUTHENTICATE, (uint)NMT_AUTHENTICATE, NSS_PREGAME, &OnAuthenticate, session); + session->AddTransition(NSS_AUTHENTICATE, static_cast(NMT_CONNECTION_LOST), + NSS_UNCONNECTED); + session->AddTransition(NSS_AUTHENTICATE, static_cast(NMT_AUTHENTICATE), NSS_PREGAME, + &OnAuthenticate, session); - session->AddTransition(NSS_PREGAME, (uint)NMT_CONNECTION_LOST, NSS_UNCONNECTED, &OnDisconnect, session); - session->AddTransition(NSS_PREGAME, (uint)NMT_CHAT, NSS_PREGAME, &OnChat, session); - session->AddTransition(NSS_PREGAME, (uint)NMT_READY, NSS_PREGAME, &OnReady, session); - session->AddTransition(NSS_PREGAME, (uint)NMT_CLEAR_ALL_READY, NSS_PREGAME, &OnClearAllReady, session); - session->AddTransition(NSS_PREGAME, (uint)NMT_GAME_SETUP, NSS_PREGAME, &OnGameSetup, session); - session->AddTransition(NSS_PREGAME, (uint)NMT_ASSIGN_PLAYER, NSS_PREGAME, &OnAssignPlayer, session); - session->AddTransition(NSS_PREGAME, (uint)NMT_KICKED, NSS_PREGAME, &OnKickPlayer, session); - session->AddTransition(NSS_PREGAME, (uint)NMT_GAME_START, NSS_PREGAME, &OnGameStart, session); - session->AddTransition(NSS_PREGAME, (uint)NMT_SAVED_GAME_START, NSS_PREGAME, &OnSavedGameStart, session); - session->AddTransition(NSS_PREGAME, (uint)NMT_LOADED_GAME, NSS_INGAME, &OnLoadedGame, session); + session->AddTransition(NSS_PREGAME, static_cast(NMT_CONNECTION_LOST), NSS_UNCONNECTED, + &OnDisconnect, session); + session->AddTransition(NSS_PREGAME, static_cast(NMT_CHAT), NSS_PREGAME, &OnChat, + session); + session->AddTransition(NSS_PREGAME, static_cast(NMT_READY), NSS_PREGAME, &OnReady, + session); + session->AddTransition(NSS_PREGAME, static_cast(NMT_CLEAR_ALL_READY), NSS_PREGAME, + &OnClearAllReady, session); + session->AddTransition(NSS_PREGAME, static_cast(NMT_GAME_SETUP), NSS_PREGAME, + &OnGameSetup, session); + session->AddTransition(NSS_PREGAME, static_cast(NMT_ASSIGN_PLAYER), NSS_PREGAME, + &OnAssignPlayer, session); + session->AddTransition(NSS_PREGAME, static_cast(NMT_KICKED), NSS_PREGAME, + &OnKickPlayer, session); + session->AddTransition(NSS_PREGAME, static_cast(NMT_GAME_START), NSS_PREGAME, + &OnGameStart, session); + session->AddTransition(NSS_PREGAME, static_cast(NMT_SAVED_GAME_START), NSS_PREGAME, + &OnSavedGameStart, session); + session->AddTransition(NSS_PREGAME, static_cast(NMT_LOADED_GAME), NSS_INGAME, + &OnLoadedGame, session); - session->AddTransition(NSS_JOIN_SYNCING, (uint)NMT_KICKED, NSS_JOIN_SYNCING, &OnKickPlayer, session); - session->AddTransition(NSS_JOIN_SYNCING, (uint)NMT_CONNECTION_LOST, NSS_UNCONNECTED, &OnDisconnect, session); - session->AddTransition(NSS_JOIN_SYNCING, (uint)NMT_LOADED_GAME, NSS_INGAME, &OnJoinSyncingLoadedGame, session); + session->AddTransition(NSS_JOIN_SYNCING, static_cast(NMT_KICKED), NSS_JOIN_SYNCING, + &OnKickPlayer, session); + session->AddTransition(NSS_JOIN_SYNCING, static_cast(NMT_CONNECTION_LOST), + NSS_UNCONNECTED, &OnDisconnect, session); + session->AddTransition(NSS_JOIN_SYNCING, static_cast(NMT_LOADED_GAME), NSS_INGAME, + &OnJoinSyncingLoadedGame, session); - session->AddTransition(NSS_INGAME, (uint)NMT_REJOINED, NSS_INGAME, &OnRejoined, session); - session->AddTransition(NSS_INGAME, (uint)NMT_KICKED, NSS_INGAME, &OnKickPlayer, session); - session->AddTransition(NSS_INGAME, (uint)NMT_CLIENT_PAUSED, NSS_INGAME, &OnClientPaused, session); - session->AddTransition(NSS_INGAME, (uint)NMT_CONNECTION_LOST, NSS_UNCONNECTED, &OnDisconnect, session); - session->AddTransition(NSS_INGAME, (uint)NMT_CHAT, NSS_INGAME, &OnChat, session); - session->AddTransition(NSS_INGAME, (uint)NMT_SIMULATION_COMMAND, NSS_INGAME, &OnSimulationCommand, session); - session->AddTransition(NSS_INGAME, (uint)NMT_FLARE, NSS_INGAME, &OnFlare, session); - session->AddTransition(NSS_INGAME, (uint)NMT_SYNC_CHECK, NSS_INGAME, &OnSyncCheck, session); - session->AddTransition(NSS_INGAME, (uint)NMT_END_COMMAND_BATCH, NSS_INGAME, &OnEndCommandBatch, session); + session->AddTransition(NSS_INGAME, static_cast(NMT_REJOINED), NSS_INGAME, &OnRejoined, + session); + session->AddTransition(NSS_INGAME, static_cast(NMT_KICKED), NSS_INGAME, &OnKickPlayer, + session); + session->AddTransition(NSS_INGAME, static_cast(NMT_CLIENT_PAUSED), NSS_INGAME, + &OnClientPaused, session); + session->AddTransition(NSS_INGAME, static_cast(NMT_CONNECTION_LOST), NSS_UNCONNECTED, + &OnDisconnect, session); + session->AddTransition(NSS_INGAME, static_cast(NMT_CHAT), NSS_INGAME, &OnChat, + session); + session->AddTransition(NSS_INGAME, static_cast(NMT_SIMULATION_COMMAND), NSS_INGAME, + &OnSimulationCommand, session); + session->AddTransition(NSS_INGAME, static_cast(NMT_FLARE), NSS_INGAME, &OnFlare, + session); + session->AddTransition(NSS_INGAME, static_cast(NMT_SYNC_CHECK), NSS_INGAME, + &OnSyncCheck, session); + session->AddTransition(NSS_INGAME, static_cast(NMT_END_COMMAND_BATCH), NSS_INGAME, + &OnEndCommandBatch, session); // Set first state session->SetFirstState(NSS_HANDSHAKE); @@ -881,7 +909,7 @@ void CNetServerWorker::ProcessLobbyAuth(const CStr& name, const CStr& token) bool CNetServerWorker::OnClientHandshake(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_CLIENT_HANDSHAKE); + ENSURE(event->GetType() == static_cast(NMT_CLIENT_HANDSHAKE)); CNetServerWorker& server = session->GetServer(); @@ -934,7 +962,7 @@ bool CNetServerWorker::OnClientHandshake(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_AUTHENTICATE); + ENSURE(event->GetType() == static_cast(NMT_AUTHENTICATE)); CNetServerWorker& server = session->GetServer(); @@ -1151,7 +1179,7 @@ bool CNetServerWorker::OnAuthenticate(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_SIMULATION_COMMAND); + ENSURE(event->GetType() == static_cast(NMT_SIMULATION_COMMAND)); CNetServerWorker& server = session->GetServer(); @@ -1188,7 +1216,7 @@ bool CNetServerWorker::OnSimulationCommand(CNetServerSession* session, CFsmEvent bool CNetServerWorker::OnFlare(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_FLARE); + ENSURE(event->GetType() == static_cast(NMT_FLARE)); CNetServerWorker& server = session->GetServer(); CFlareMessage* message = (CFlareMessage*)event->GetParamRef(); @@ -1200,7 +1228,7 @@ bool CNetServerWorker::OnFlare(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_SYNC_CHECK); + ENSURE(event->GetType() == static_cast(NMT_SYNC_CHECK)); CNetServerWorker& server = session->GetServer(); @@ -1212,7 +1240,7 @@ bool CNetServerWorker::OnSyncCheck(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_END_COMMAND_BATCH); + ENSURE(event->GetType() == static_cast(NMT_END_COMMAND_BATCH)); CNetServerWorker& server = session->GetServer(); @@ -1225,7 +1253,7 @@ bool CNetServerWorker::OnEndCommandBatch(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_CHAT); + ENSURE(event->GetType() == static_cast(NMT_CHAT)); CNetServerWorker& server = session->GetServer(); @@ -1251,7 +1279,7 @@ bool CNetServerWorker::OnChat(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_READY); + ENSURE(event->GetType() == static_cast(NMT_READY)); CNetServerWorker& server = session->GetServer(); @@ -1271,7 +1299,7 @@ bool CNetServerWorker::OnReady(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_CLEAR_ALL_READY); + ENSURE(event->GetType() == static_cast(NMT_CLEAR_ALL_READY)); CNetServerWorker& server = session->GetServer(); @@ -1283,7 +1311,7 @@ bool CNetServerWorker::OnClearAllReady(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_GAME_SETUP); + ENSURE(event->GetType() == static_cast(NMT_GAME_SETUP)); CNetServerWorker& server = session->GetServer(); @@ -1306,7 +1334,7 @@ bool CNetServerWorker::OnGameSetup(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_ASSIGN_PLAYER); + ENSURE(event->GetType() == static_cast(NMT_ASSIGN_PLAYER)); CNetServerWorker& server = session->GetServer(); if (session->GetGUID() == server.m_ControllerGUID) @@ -1319,7 +1347,7 @@ bool CNetServerWorker::OnAssignPlayer(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_GAME_START); + ENSURE(event->GetType() == static_cast(NMT_GAME_START)); CNetServerWorker& server = session->GetServer(); if (session->GetGUID() != server.m_ControllerGUID) @@ -1332,7 +1360,7 @@ bool CNetServerWorker::OnGameStart(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == static_cast(NMT_SAVED_GAME_START)); + ENSURE(event->GetType() == static_cast(NMT_SAVED_GAME_START)); CNetServerWorker& server{session->GetServer()}; if (session->GetGUID() != server.m_ControllerGUID) @@ -1351,7 +1379,7 @@ bool CNetServerWorker::OnSavedGameStart(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_LOADED_GAME); + ENSURE(event->GetType() == static_cast(NMT_LOADED_GAME)); CNetServerWorker& server = loadedSession->GetServer(); @@ -1396,7 +1424,7 @@ bool CNetServerWorker::OnJoinSyncingLoadedGame(CNetServerSession* session, CFsmE // we could try repeating this process a few times until the client converges // on the up-to-date state, before setting them as active.) - ENSURE(event->GetType() == (uint)NMT_LOADED_GAME); + ENSURE(event->GetType() == static_cast(NMT_LOADED_GAME)); CNetServerWorker& server = session->GetServer(); @@ -1438,7 +1466,7 @@ bool CNetServerWorker::OnJoinSyncingLoadedGame(CNetServerSession* session, CFsmE bool CNetServerWorker::OnRejoined(CNetServerSession* session, CFsmEvent* event) { // A client has finished rejoining and the loading screen disappeared. - ENSURE(event->GetType() == (uint)NMT_REJOINED); + ENSURE(event->GetType() == static_cast(NMT_REJOINED)); CNetServerWorker& server = session->GetServer(); @@ -1461,7 +1489,7 @@ bool CNetServerWorker::OnRejoined(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_KICKED); + ENSURE(event->GetType() == static_cast(NMT_KICKED)); CNetServerWorker& server = session->GetServer(); @@ -1475,7 +1503,7 @@ bool CNetServerWorker::OnKickPlayer(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_CONNECTION_LOST); + ENSURE(event->GetType() == static_cast(NMT_CONNECTION_LOST)); CNetServerWorker& server = session->GetServer(); @@ -1486,7 +1514,7 @@ bool CNetServerWorker::OnDisconnect(CNetServerSession* session, CFsmEvent* event) { - ENSURE(event->GetType() == (uint)NMT_CLIENT_PAUSED); + ENSURE(event->GetType() == static_cast(NMT_CLIENT_PAUSED)); CNetServerWorker& server = session->GetServer(); diff --git a/source/network/NetServerSession.cpp b/source/network/NetServerSession.cpp index e9eb0466d5..71f2c8f63c 100644 --- a/source/network/NetServerSession.cpp +++ b/source/network/NetServerSession.cpp @@ -56,7 +56,7 @@ void CNetServerSession::Disconnect(NetDisconnectReason reason) if (reason == NDR_UNKNOWN) LOGWARNING("Disconnecting client without communicating the disconnect reason!"); - Update((uint)NMT_CONNECTION_LOST, NULL); + Update(static_cast(NMT_CONNECTION_LOST), nullptr); enet_peer_disconnect(m_Peer, static_cast(reason)); } diff --git a/source/network/tests/test_Net.h b/source/network/tests/test_Net.h index 3165b42ec0..44a63abb34 100644 --- a/source/network/tests/test_Net.h +++ b/source/network/tests/test_Net.h @@ -80,7 +80,7 @@ public: DeleteDirectory(DataDir()/"_testcache"); } - bool clients_are_all(const std::vector& clients, uint state) + bool clients_are_all(const std::vector& clients, unsigned int state) { for (size_t j = 0; j < clients.size(); ++j) if (clients[j]->GetCurrState() != state) diff --git a/source/ps/Hotkey.h b/source/ps/Hotkey.h index 40c24ae9e1..952c1d7472 100644 --- a/source/ps/Hotkey.h +++ b/source/ps/Hotkey.h @@ -31,7 +31,6 @@ * triggered. All with the hotkey name stored in ev.user.data1 as a const char*. */ -#include "lib/types.h" #include "ps/CStr.h" #include "ps/containers/StaticVector.h" #include "ps/Input.h" @@ -44,12 +43,12 @@ using SDL_Scancode_ = int; // 0x8000 is SDL_USEREVENT, this is static_asserted in Hotkey.cpp // We do this to avoid including SDL in this header. -const uint SDL_USEREVENT_ = 0x8000; -const uint SDL_HOTKEYPRESS = SDL_USEREVENT_; -const uint SDL_HOTKEYDOWN = SDL_USEREVENT_ + 1; -const uint SDL_HOTKEYUP = SDL_USEREVENT_ + 2; -const uint SDL_HOTKEYPRESS_SILENT = SDL_USEREVENT_ + 3; -const uint SDL_HOTKEYUP_SILENT = SDL_USEREVENT_ + 4; +const unsigned int SDL_USEREVENT_ = 0x8000; +const unsigned int SDL_HOTKEYPRESS = SDL_USEREVENT_; +const unsigned int SDL_HOTKEYDOWN = SDL_USEREVENT_ + 1; +const unsigned int SDL_HOTKEYUP = SDL_USEREVENT_ + 2; +const unsigned int SDL_HOTKEYPRESS_SILENT = SDL_USEREVENT_ + 3; +const unsigned int SDL_HOTKEYUP_SILENT = SDL_USEREVENT_ + 4; // Value not mapping to any valid SDL_SCANCODE_* constexpr SDL_Scancode_ UNUSED_HOTKEY_CODE{-1}; diff --git a/source/scriptinterface/Interface.cpp b/source/scriptinterface/Interface.cpp index 1f9f09745b..4395f6ea4d 100644 --- a/source/scriptinterface/Interface.cpp +++ b/source/scriptinterface/Interface.cpp @@ -148,12 +148,12 @@ JSClass global_class = { // Functions in the global namespace: -bool print(JSContext* cx, uint argc, JS::Value* vp) +bool print(JSContext* cx, unsigned int argc, JS::Value* vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); Script::Request rq(cx); - for (uint i = 0; i < args.length(); ++i) + for (unsigned int i = 0; i < args.length(); ++i) { std::wstring str; if (!Script::FromJSVal(rq, args[i], str)) @@ -165,7 +165,7 @@ bool print(JSContext* cx, uint argc, JS::Value* vp) return true; } -bool logmsg(JSContext* cx, uint argc, JS::Value* vp) +bool logmsg(JSContext* cx, unsigned int argc, JS::Value* vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); if (args.length() < 1) @@ -183,7 +183,7 @@ bool logmsg(JSContext* cx, uint argc, JS::Value* vp) return true; } -bool warn(JSContext* cx, uint argc, JS::Value* vp) +bool warn(JSContext* cx, unsigned int argc, JS::Value* vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); if (args.length() < 1) @@ -201,7 +201,7 @@ bool warn(JSContext* cx, uint argc, JS::Value* vp) return true; } -bool error(JSContext* cx, uint argc, JS::Value* vp) +bool error(JSContext* cx, unsigned int argc, JS::Value* vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); if (args.length() < 1) @@ -323,7 +323,7 @@ bool Interface::MathRandom(double& nbr) const return true; } -bool Interface::Math_random(JSContext* cx, uint argc, JS::Value* vp) +bool Interface::Math_random(JSContext* cx, unsigned int argc, JS::Value* vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); double r; @@ -528,7 +528,8 @@ void Interface::CallConstructor(JS::HandleValue ctor, JS::HandleValueArray argv, out.setObjectOrNull(objOut); } -void Interface::DefineCustomObjectType(JSClass *clasp, JSNative constructor, uint minArgs, JSPropertySpec *ps, JSFunctionSpec *fs, JSPropertySpec *static_ps, JSFunctionSpec *static_fs) +void Interface::DefineCustomObjectType(JSClass *clasp, JSNative constructor, unsigned int minArgs, + JSPropertySpec *ps, JSFunctionSpec *fs, JSPropertySpec *static_ps, JSFunctionSpec *static_fs) { Request rq(this); std::string typeName = clasp->name; @@ -606,7 +607,7 @@ bool Interface::SetGlobal_(const char* name, JS::HandleValue value, bool replace } } - uint attrs = 0; + unsigned int attrs = 0; if (constant) attrs |= JSPROP_READONLY; if (enumerate) diff --git a/source/scriptinterface/Interface.h b/source/scriptinterface/Interface.h index 6320f10271..d189a0af3e 100644 --- a/source/scriptinterface/Interface.h +++ b/source/scriptinterface/Interface.h @@ -19,7 +19,6 @@ #define INCLUDED_SCRIPT_INTERFACE #include "lib/code_annotation.h" -#include "lib/types.h" #include "ps/Errors.h" #include "scriptinterface/Conversions.h" #include "scriptinterface/Exceptions.h" @@ -196,7 +195,8 @@ public: void CallConstructor(JS::HandleValue ctor, JS::HandleValueArray argv, JS::MutableHandleValue out) const; JSObject* CreateCustomObject(const std::string & typeName) const; - void DefineCustomObjectType(JSClass *clasp, JSNative constructor, uint minArgs, JSPropertySpec *ps, JSFunctionSpec *fs, JSPropertySpec *static_ps, JSFunctionSpec *static_fs); + void DefineCustomObjectType(JSClass *clasp, JSNative constructor, unsigned int minArgs, + JSPropertySpec *ps, JSFunctionSpec *fs, JSPropertySpec *static_ps, JSFunctionSpec *static_fs); /** * Set the named property on the global object. @@ -255,7 +255,7 @@ public: /** * JSNative wrapper of the above. */ - static bool Math_random(JSContext* cx, uint argc, JS::Value* vp); + static bool Math_random(JSContext* cx, unsigned int argc, JS::Value* vp); /** * Name the reserved slots we may need to use in custom JSObjects. diff --git a/source/scriptinterface/Object.h b/source/scriptinterface/Object.h index cdd71eb406..176db47544 100644 --- a/source/scriptinterface/Object.h +++ b/source/scriptinterface/Object.h @@ -19,7 +19,6 @@ #define INCLUDED_SCRIPTINTERFACE_OBJECT #include "lib/posix/posix_types.h" -#include "lib/types.h" #include "ps/CLogger.h" #include "scriptinterface/Conversions.h" #include "scriptinterface/Request.h" @@ -114,7 +113,7 @@ inline bool HasProperty(const Script::Request& rq, JS::HandleValue obj, const ch template inline bool SetProperty(const Script::Request& rq, JS::HandleValue obj, PropType name, JS::HandleValue value, bool constant = false, bool enumerable = true) { - uint attrs = 0; + unsigned int attrs = 0; if (constant) attrs |= JSPROP_READONLY | JSPROP_PERMANENT; if (enumerable) diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp index 3c701c6bbb..d1e4bb38c1 100644 --- a/source/simulation2/serialization/BinarySerializer.cpp +++ b/source/simulation2/serialization/BinarySerializer.cpp @@ -137,7 +137,7 @@ void CBinarySerializerScriptImpl::HandleScriptVal(const Script::Request& rq, JS: // Arrays like [1, 2, ] have an 'undefined' at the end which is part of the // length but seemingly isn't enumerated, so store the length explicitly - uint length = 0; + unsigned int length = 0; if (!JS::GetArrayLength(rq.cx, obj, &length)) throw PSERROR_Serialize_ScriptError("JS::GetArrayLength failed"); m_Serializer.NumberU32_Unbounded("array length", length); diff --git a/source/simulation2/system/TurnManager.h b/source/simulation2/system/TurnManager.h index 7ec5a941e9..d02cc88033 100644 --- a/source/simulation2/system/TurnManager.h +++ b/source/simulation2/system/TurnManager.h @@ -19,7 +19,6 @@ #define INCLUDED_TURNMANAGER #include "lib/code_annotation.h" -#include "lib/types.h" #include "ps/CStr.h" #include "simulation2/helpers/SimulationCommand.h" @@ -212,7 +211,7 @@ protected: std::deque>> m_QueuedCommands; int m_PlayerId; - uint m_ClientId; + unsigned int m_ClientId; /// Simulation time remaining until we ought to execute the next turn (as a negative value to /// add elapsed time increments to until we reach 0).