From fe9814325e23929aa09c77a2a930b2237d735675 Mon Sep 17 00:00:00 2001 From: Cyp Date: Mon, 1 Oct 2012 19:54:27 +0200 Subject: [PATCH] Squelch some minor warnings. --- src/fpath.cpp | 1 + src/multiint.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/fpath.cpp b/src/fpath.cpp index 11ac72b7a..429cec18e 100644 --- a/src/fpath.cpp +++ b/src/fpath.cpp @@ -653,6 +653,7 @@ void fpathTest(int x, int y, int x2, int y2) } //assert(pathJobs.empty()); // can now be marked .deleted as well assert(pathResults.empty()); + (void)r; // Squelch unused-but-set warning. } bool fpathCheck(Position orig, Position dest, PROPULSION_TYPE propulsion) diff --git a/src/multiint.cpp b/src/multiint.cpp index 2e3fd0508..861bf1b4f 100644 --- a/src/multiint.cpp +++ b/src/multiint.cpp @@ -2043,7 +2043,7 @@ static bool changePosition(UBYTE player, UBYTE position) debug(LOG_ERROR, "Failed to swap positions for player %d, position %d", (int)player, (int)position); if (player < game.maxPlayers && position < game.maxPlayers) { - debug(LOG_NET, "corrupted positions :player (%hhu) new position (%hhu) old position (%d)", player, position, NetPlay.players[player].position ); + debug(LOG_NET, "corrupted positions: player (%u) new position (%u) old position (%d)", player, position, NetPlay.players[player].position); // Positions were corrupted. Attempt to fix. NetPlay.players[player].position = position; NETBroadcastPlayerInfo(player); @@ -2089,7 +2089,7 @@ bool changeColour(unsigned player, int col, bool isHost) if (player < game.maxPlayers && col < MAX_PLAYERS) { // Colours were corrupted. Attempt to fix. - debug(LOG_NET, "corrupted colors :player (%hhu) new position (%hhu) old color (%d)", player, col, NetPlay.players[player].colour ); + debug(LOG_NET, "corrupted colours: player (%u) new colour (%u) old colour (%d)", player, col, NetPlay.players[player].colour); setPlayerColour(player, col); NetPlay.players[player].colour = col; NETBroadcastPlayerInfo(player);