We now only show games that are newer, or the same version. (Until th…

…e time we have a good way to filter games via GUI control)
Warzone2100 · Feb 16, 2013 · 303fba6 · 303fba6
1 parent 1215889
commit 303fba6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/lib/netplay/netplay.cpp b/lib/netplay/netplay.cpp
@@ -181,6 +181,17 @@ 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);
 }
+
+int NETGetMajorVersion(void)
+{
+	return NETCODE_VERSION_MAJOR;
+}
+
+int NETGetMinorVersion(void)
+{
+	return NETCODE_VERSION_MINOR;
+}
+
 //	Sets if the game is password protected or not
 void NETGameLocked( bool flag)
 {

diff --git a/lib/netplay/netplay.h b/lib/netplay/netplay.h
@@ -332,6 +332,8 @@ 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 int NETGetMajorVersion(void);
+extern int NETGetMinorVersion(void);
 void NET_InitPlayer(int i, bool initPosition);
 extern void NET_InitPlayers(void);
 

diff --git a/src/multiint.cpp b/src/multiint.cpp
@@ -923,9 +923,9 @@ static void addGames(void)
 	static const char *badModTip = "Your loaded mods are incompatible with this game. (Check mods/autoload/?)";
 
 	//count games to see if need two columns.
-	for(i=0;i<MaxGames;i++)							// draw games
+	for (i=0; i < MaxGames; i++)
 	{
-		if( NetPlay.games[i].desc.dwSize !=0)
+		if (NetPlay.games[i].desc.dwSize !=0)
 		{
 			gcount++;
 		}
@@ -955,7 +955,8 @@ static void addGames(void)
 		for (i=0; i<MaxGames; i++)							// draw games
 		{
 			widgDelete(psWScreen, GAMES_GAMESTART+i);	// remove old icon.
-			if (NetPlay.games[i].desc.dwSize !=0)
+			// Since we lack a filter GUI button, we only show newer or same versions.
+			if (NetPlay.games[i].desc.dwSize !=0 && ((NetPlay.games[i].game_version_major >= NETGetMajorVersion()) && (NetPlay.games[i].game_version_minor >= NETGetMinorVersion())))
 			{
 
 				sButInit.id = GAMES_GAMESTART+i;