Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Squelch some minor warnings.

master
Cyp 2012-10-01 19:54:27 +02:00
parent 2cb06fb92a
commit fe9814325e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/fpath.cpp
View File

@ -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)

4
src/multiint.cpp
View File

@ -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);