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

Replaces NETgameIsCorrectVersion with NETisCorrectVersion, removes NETgameIsCorrectVersion.

master
Rene Jochum 2011-04-25 20:35:05 +02:00
parent 15b5b6a48f
commit b3106415ba
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/netplay/netplay.cpp
View File

@ -180,11 +180,6 @@ bool NETisCorrectVersion(uint32_t game_version_major, uint32_t game_version_mino
{
return (NETCODE_VERSION_MAJOR == game_version_major && NETCODE_VERSION_MINOR == game_version_minor);
}
bool NETgameIsCorrectVersion(GAMESTRUCT* check_game)
{
return (NETCODE_VERSION_MAJOR == check_game->game_version_major && NETCODE_VERSION_MINOR == check_game->game_version_minor);
}
// Sets if the game is password protected or not
void NETGameLocked( bool flag)
{

1
lib/netplay/netplay.h
View File

@ -350,7 +350,6 @@ extern void NETsetGamePassword(const char *password);
extern void NETBroadcastPlayerInfo(uint32_t index);
void NETBroadcastTwoPlayerInfo(uint32_t index1, uint32_t index2);
extern bool NETisCorrectVersion(uint32_t game_version_major, uint32_t game_version_minor);
extern bool NETgameIsCorrectVersion(GAMESTRUCT* check_game);
void NET_InitPlayer(int i, bool initPosition);
extern void NET_InitPlayers(void);

4
src/multiint.cpp
View File

@ -822,7 +822,7 @@ static void addGames(void)
}
}
// display the correct tooltip message.
if (!NETgameIsCorrectVersion(&NetPlay.games[i]))
if (!NETisCorrectVersion(NetPlay.games[i].game_version_minor, NetPlay.games[i].game_version_major))
{
sButInit.pTip = wrongVersionTip;
}
@ -3615,7 +3615,7 @@ void displayRemoteGame(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGH
// need some sort of closed thing here!
iV_DrawImage(FrontImages,IMAGE_NOJOIN,x+18,y+11);
}
else if (NETgameIsCorrectVersion(&NetPlay.games[i]))
else if (!NETisCorrectVersion(NetPlay.games[i].game_version_minor, NetPlay.games[i].game_version_major))
{
if (NetPlay.games[gameNumber].desc.dwCurrentPlayers >= NetPlay.games[gameNumber].desc.dwMaxPlayers)
{