From 496b2a73fd06c4bab3455627d8ec021fdace4333 Mon Sep 17 00:00:00 2001
From: Per Inge Mathisen <per@wz2100.net>
Date: Sun, 9 Mar 2008 15:45:05 +0000
Subject: [PATCH] game.maxPlayers cleanup - remove unnecessary references.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3977 4a71c877-e1ca-e34f-864e-861f7616d084
---
 src/configuration.c | 12 ------------
 src/init.c          |  2 --
 src/keybind.c       |  2 --
 src/multiint.c      | 14 ++++----------
 src/multimenu.c     |  6 ------
 src/multiopt.c      |  2 --
 6 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/src/configuration.c b/src/configuration.c
index 40b99ebc1..9545d12c9 100644
--- a/src/configuration.c
+++ b/src/configuration.c
@@ -410,17 +410,6 @@ BOOL loadConfig(void)
 		setWarzoneKeyNumeric("base", game.base);
 	}
 
-	//maxplay
-	if(getWarzoneKeyNumeric("maxPlay", &val))
-	{
-		game.maxPlayers =(UBYTE)val;
-	}
-	else
-	{
-		game.maxPlayers = 4;
-		setWarzoneKeyNumeric("maxPlay", game.maxPlayers);
-	}
-
 	//alliance
 	if(getWarzoneKeyNumeric("alliance", &val))
 	{
@@ -626,7 +615,6 @@ BOOL saveConfig(void)
 		setWarzoneKeyNumeric("type", game.type);				// game type
 		setWarzoneKeyNumeric("base", game.base);				// size of base
 		setWarzoneKeyNumeric("fog", game.fog);				// fog 'o war
-		setWarzoneKeyNumeric("maxPlay", game.maxPlayers);		// max no of players
 		setWarzoneKeyNumeric("alliance", game.alliance);			// allow alliances
 		setWarzoneKeyString("forceName", sForceName);			// force
 		setWarzoneKeyString("playerName",(char*)sPlayer);		// player name
diff --git a/src/init.c b/src/init.c
index 0f297b7bc..371d11455 100644
--- a/src/init.c
+++ b/src/init.c
@@ -412,8 +412,6 @@ BOOL systemInitialise(void)
 
 	buildMapList();
 
-	//loadLevels(DIR_CAMPAIGN);
-
 	// Initialize render engine
 	war_SetFog(FALSE);
 	if (!pie_Initialise()) {
diff --git a/src/keybind.c b/src/keybind.c
index 24452c7a1..029192df5 100644
--- a/src/keybind.c
+++ b/src/keybind.c
@@ -2439,8 +2439,6 @@ BOOL	processConsoleCommands( char *pName )
 	{
 		char tmpStr[255];
 
-
-
 		/* saveai x */
 		for(i=0;i<MAX_PLAYERS;i++)
 		{
diff --git a/src/multiint.c b/src/multiint.c
index c211cd2e0..27d82430e 100644
--- a/src/multiint.c
+++ b/src/multiint.c
@@ -21,8 +21,8 @@
  * MultiInt.c
  *
  * Alex Lee, 98. Pumpkin Studios, Bath.
- * Functions to display and handle the multiplayer interface screens
- * Arena and Campaign styles, along with connection and game options.
+ * Functions to display and handle the multiplayer interface screens,
+ * along with connection and game options.
  */
 
 #include "lib/framework/frame.h"
@@ -832,7 +832,6 @@ static void addGameOptions(BOOL bRedo)
 		iV_GetImageHeight(FrontImages,IMAGE_RETURN),
 		_("Return To Previous Screen"),IMAGE_RETURN,IMAGE_RETURN_HI,TRUE);
 
-
 	// host Games button
 	if(ingame.bHostSetup && !bHosted)
 	{
@@ -924,7 +923,7 @@ static void addColourChooser(UDWORD player)
 				MULTIOP_ROW_WIDTH,MULTIOP_PLAYERHEIGHT);
 
 	// add the flags
-	for(i=0;i<MAX_PLAYERS;i++)		//game.maxPlayers;i++)
+	for (i = 0; i < MAX_PLAYERS; i++)
 	{
 		addMultiBut(psWScreen,MULTIOP_COLCHOOSER_FORM, MULTIOP_COLCHOOSER+i,
 			(i*(iV_GetImageWidth(FrontImages,IMAGE_PLAYER0) +5)+7) ,//x
@@ -1129,7 +1128,7 @@ static void addTeamChooser(UDWORD player)
 				MULTIOP_ROW_WIDTH,MULTIOP_TEAMSHEIGHT);
 
 	// add the teams
-	for(i=0;i<MAX_PLAYERS;i++)		//game.maxPlayers;i++)
+	for (i = 0; i < MAX_PLAYERS; i++)
 	{
 		W_BUTINIT		sButInit;
 
@@ -1560,9 +1559,7 @@ static void processMultiopWidgets(UDWORD id)
 			game.type = CAMPAIGN;
 			widgSetString(psWScreen, MULTIOP_MAP, DEFAULTCAMPAIGNMAP);
 			strcpy(game.map,widgGetString(psWScreen, MULTIOP_MAP));
-			game.maxPlayers = 4;
 			game.alliance = NO_ALLIANCES;
-
 			addGameOptions(FALSE);
 			break;
 
@@ -1570,11 +1567,8 @@ static void processMultiopWidgets(UDWORD id)
 			widgSetButtonState(psWScreen, MULTIOP_CAMPAIGN,0 );
 			widgSetButtonState(psWScreen, MULTIOP_SKIRMISH,WBUT_LOCK);
 			game.type = SKIRMISH;
-
 			widgSetString(psWScreen, MULTIOP_MAP, DEFAULTSKIRMISHMAP);
 			strcpy(game.map,widgGetString(psWScreen, MULTIOP_MAP));
-			game.maxPlayers = 4;
-
 			addGameOptions(FALSE);
 			break;
 		}
diff --git a/src/multimenu.c b/src/multimenu.c
index f95f78fc3..e751628d9 100644
--- a/src/multimenu.c
+++ b/src/multimenu.c
@@ -222,8 +222,6 @@ static BOOL enumerateMultiMaps(char *found, UDWORD *players,BOOL first, UBYTE ca
 				lev = lev->psNext;
 				return TRUE;
 			}
-
-
 		}
 		lev = lev->psNext;
 	}
@@ -778,8 +776,6 @@ void displayMultiPlayer(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIG
 
 	if(isHumanPlayer(player) || (game.type == SKIRMISH && player<game.maxPlayers) )
 	{
-		//c2:name,
-
 		sprintf(str,"%d:", player);
 
 		strcat(str, getPlayerName(player));
@@ -1234,7 +1230,6 @@ BOOL intAddMultiMenu(void)
 	formHeight = MULTIMENU_PLAYER_H+7;
 	for(i=0;i<MAX_PLAYERS;i++)
 	{
-//		if(isHumanPlayer(i) || (game.type == SKIRMISH && i<game.maxPlayers && game.skirmishPlayers[i] ))
 		if(isHumanPlayer(i) || (game.type == SKIRMISH && i<game.maxPlayers && game.skDiff[i] ))
 		{
 			formHeight += MULTIMENU_PLAYER_H;
@@ -1261,7 +1256,6 @@ BOOL intAddMultiMenu(void)
 	// add any players
 	for(i=0;i<MAX_PLAYERS;i++)
 	{
-//		if(isHumanPlayer(i) || (game.type == SKIRMISH && i<game.maxPlayers && game.skirmishPlayers[i] ) )
 		if(isHumanPlayer(i) || (game.type == SKIRMISH && i<game.maxPlayers && game.skDiff[i] ) )
 		{
 			addMultiPlayer(i,pos);
diff --git a/src/multiopt.c b/src/multiopt.c
index f445f65f3..888b9f8df 100644
--- a/src/multiopt.c
+++ b/src/multiopt.c
@@ -374,7 +374,6 @@ BOOL joinCampaign(UDWORD gameNumber, char *sPlayer)
 
 	if(!ingame.localJoiningInProgress)
 	{
-//		game.type = CAMPAIGN;
 		NETjoinGame(gameNumber, sPlayer);	// join
 		ingame.localJoiningInProgress	= TRUE;
 
@@ -617,7 +616,6 @@ static BOOL cleanMap(UDWORD player)
 	// reverse so we always remove the last object. re-reverse afterwards.
 //	reverseObjectList((BASE_OBJECT**)&apsStructLists[player]);
 
-
 	switch(game.base)
 	{
 	case CAMP_CLEAN:									//clean map