game.maxPlayers cleanup - remove unnecessary references.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3977 4a71c877-e1ca-e34f-864e-861f7616d084master
parent
f7186877fe
commit
496b2a73fd
|
@ -410,17 +410,6 @@ BOOL loadConfig(void)
|
||||||
setWarzoneKeyNumeric("base", game.base);
|
setWarzoneKeyNumeric("base", game.base);
|
||||||
}
|
}
|
||||||
|
|
||||||
//maxplay
|
|
||||||
if(getWarzoneKeyNumeric("maxPlay", &val))
|
|
||||||
{
|
|
||||||
game.maxPlayers =(UBYTE)val;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
game.maxPlayers = 4;
|
|
||||||
setWarzoneKeyNumeric("maxPlay", game.maxPlayers);
|
|
||||||
}
|
|
||||||
|
|
||||||
//alliance
|
//alliance
|
||||||
if(getWarzoneKeyNumeric("alliance", &val))
|
if(getWarzoneKeyNumeric("alliance", &val))
|
||||||
{
|
{
|
||||||
|
@ -626,7 +615,6 @@ BOOL saveConfig(void)
|
||||||
setWarzoneKeyNumeric("type", game.type); // game type
|
setWarzoneKeyNumeric("type", game.type); // game type
|
||||||
setWarzoneKeyNumeric("base", game.base); // size of base
|
setWarzoneKeyNumeric("base", game.base); // size of base
|
||||||
setWarzoneKeyNumeric("fog", game.fog); // fog 'o war
|
setWarzoneKeyNumeric("fog", game.fog); // fog 'o war
|
||||||
setWarzoneKeyNumeric("maxPlay", game.maxPlayers); // max no of players
|
|
||||||
setWarzoneKeyNumeric("alliance", game.alliance); // allow alliances
|
setWarzoneKeyNumeric("alliance", game.alliance); // allow alliances
|
||||||
setWarzoneKeyString("forceName", sForceName); // force
|
setWarzoneKeyString("forceName", sForceName); // force
|
||||||
setWarzoneKeyString("playerName",(char*)sPlayer); // player name
|
setWarzoneKeyString("playerName",(char*)sPlayer); // player name
|
||||||
|
|
|
@ -412,8 +412,6 @@ BOOL systemInitialise(void)
|
||||||
|
|
||||||
buildMapList();
|
buildMapList();
|
||||||
|
|
||||||
//loadLevels(DIR_CAMPAIGN);
|
|
||||||
|
|
||||||
// Initialize render engine
|
// Initialize render engine
|
||||||
war_SetFog(FALSE);
|
war_SetFog(FALSE);
|
||||||
if (!pie_Initialise()) {
|
if (!pie_Initialise()) {
|
||||||
|
|
|
@ -2439,8 +2439,6 @@ BOOL processConsoleCommands( char *pName )
|
||||||
{
|
{
|
||||||
char tmpStr[255];
|
char tmpStr[255];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* saveai x */
|
/* saveai x */
|
||||||
for(i=0;i<MAX_PLAYERS;i++)
|
for(i=0;i<MAX_PLAYERS;i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,8 +21,8 @@
|
||||||
* MultiInt.c
|
* MultiInt.c
|
||||||
*
|
*
|
||||||
* Alex Lee, 98. Pumpkin Studios, Bath.
|
* Alex Lee, 98. Pumpkin Studios, Bath.
|
||||||
* Functions to display and handle the multiplayer interface screens
|
* Functions to display and handle the multiplayer interface screens,
|
||||||
* Arena and Campaign styles, along with connection and game options.
|
* along with connection and game options.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "lib/framework/frame.h"
|
#include "lib/framework/frame.h"
|
||||||
|
@ -832,7 +832,6 @@ static void addGameOptions(BOOL bRedo)
|
||||||
iV_GetImageHeight(FrontImages,IMAGE_RETURN),
|
iV_GetImageHeight(FrontImages,IMAGE_RETURN),
|
||||||
_("Return To Previous Screen"),IMAGE_RETURN,IMAGE_RETURN_HI,TRUE);
|
_("Return To Previous Screen"),IMAGE_RETURN,IMAGE_RETURN_HI,TRUE);
|
||||||
|
|
||||||
|
|
||||||
// host Games button
|
// host Games button
|
||||||
if(ingame.bHostSetup && !bHosted)
|
if(ingame.bHostSetup && !bHosted)
|
||||||
{
|
{
|
||||||
|
@ -924,7 +923,7 @@ static void addColourChooser(UDWORD player)
|
||||||
MULTIOP_ROW_WIDTH,MULTIOP_PLAYERHEIGHT);
|
MULTIOP_ROW_WIDTH,MULTIOP_PLAYERHEIGHT);
|
||||||
|
|
||||||
// add the flags
|
// 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,
|
addMultiBut(psWScreen,MULTIOP_COLCHOOSER_FORM, MULTIOP_COLCHOOSER+i,
|
||||||
(i*(iV_GetImageWidth(FrontImages,IMAGE_PLAYER0) +5)+7) ,//x
|
(i*(iV_GetImageWidth(FrontImages,IMAGE_PLAYER0) +5)+7) ,//x
|
||||||
|
@ -1129,7 +1128,7 @@ static void addTeamChooser(UDWORD player)
|
||||||
MULTIOP_ROW_WIDTH,MULTIOP_TEAMSHEIGHT);
|
MULTIOP_ROW_WIDTH,MULTIOP_TEAMSHEIGHT);
|
||||||
|
|
||||||
// add the teams
|
// add the teams
|
||||||
for(i=0;i<MAX_PLAYERS;i++) //game.maxPlayers;i++)
|
for (i = 0; i < MAX_PLAYERS; i++)
|
||||||
{
|
{
|
||||||
W_BUTINIT sButInit;
|
W_BUTINIT sButInit;
|
||||||
|
|
||||||
|
@ -1560,9 +1559,7 @@ static void processMultiopWidgets(UDWORD id)
|
||||||
game.type = CAMPAIGN;
|
game.type = CAMPAIGN;
|
||||||
widgSetString(psWScreen, MULTIOP_MAP, DEFAULTCAMPAIGNMAP);
|
widgSetString(psWScreen, MULTIOP_MAP, DEFAULTCAMPAIGNMAP);
|
||||||
strcpy(game.map,widgGetString(psWScreen, MULTIOP_MAP));
|
strcpy(game.map,widgGetString(psWScreen, MULTIOP_MAP));
|
||||||
game.maxPlayers = 4;
|
|
||||||
game.alliance = NO_ALLIANCES;
|
game.alliance = NO_ALLIANCES;
|
||||||
|
|
||||||
addGameOptions(FALSE);
|
addGameOptions(FALSE);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -1570,11 +1567,8 @@ static void processMultiopWidgets(UDWORD id)
|
||||||
widgSetButtonState(psWScreen, MULTIOP_CAMPAIGN,0 );
|
widgSetButtonState(psWScreen, MULTIOP_CAMPAIGN,0 );
|
||||||
widgSetButtonState(psWScreen, MULTIOP_SKIRMISH,WBUT_LOCK);
|
widgSetButtonState(psWScreen, MULTIOP_SKIRMISH,WBUT_LOCK);
|
||||||
game.type = SKIRMISH;
|
game.type = SKIRMISH;
|
||||||
|
|
||||||
widgSetString(psWScreen, MULTIOP_MAP, DEFAULTSKIRMISHMAP);
|
widgSetString(psWScreen, MULTIOP_MAP, DEFAULTSKIRMISHMAP);
|
||||||
strcpy(game.map,widgGetString(psWScreen, MULTIOP_MAP));
|
strcpy(game.map,widgGetString(psWScreen, MULTIOP_MAP));
|
||||||
game.maxPlayers = 4;
|
|
||||||
|
|
||||||
addGameOptions(FALSE);
|
addGameOptions(FALSE);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -222,8 +222,6 @@ static BOOL enumerateMultiMaps(char *found, UDWORD *players,BOOL first, UBYTE ca
|
||||||
lev = lev->psNext;
|
lev = lev->psNext;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
lev = lev->psNext;
|
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) )
|
if(isHumanPlayer(player) || (game.type == SKIRMISH && player<game.maxPlayers) )
|
||||||
{
|
{
|
||||||
//c2:name,
|
|
||||||
|
|
||||||
sprintf(str,"%d:", player);
|
sprintf(str,"%d:", player);
|
||||||
|
|
||||||
strcat(str, getPlayerName(player));
|
strcat(str, getPlayerName(player));
|
||||||
|
@ -1234,7 +1230,6 @@ BOOL intAddMultiMenu(void)
|
||||||
formHeight = MULTIMENU_PLAYER_H+7;
|
formHeight = MULTIMENU_PLAYER_H+7;
|
||||||
for(i=0;i<MAX_PLAYERS;i++)
|
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] ))
|
if(isHumanPlayer(i) || (game.type == SKIRMISH && i<game.maxPlayers && game.skDiff[i] ))
|
||||||
{
|
{
|
||||||
formHeight += MULTIMENU_PLAYER_H;
|
formHeight += MULTIMENU_PLAYER_H;
|
||||||
|
@ -1261,7 +1256,6 @@ BOOL intAddMultiMenu(void)
|
||||||
// add any players
|
// add any players
|
||||||
for(i=0;i<MAX_PLAYERS;i++)
|
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] ) )
|
if(isHumanPlayer(i) || (game.type == SKIRMISH && i<game.maxPlayers && game.skDiff[i] ) )
|
||||||
{
|
{
|
||||||
addMultiPlayer(i,pos);
|
addMultiPlayer(i,pos);
|
||||||
|
|
|
@ -374,7 +374,6 @@ BOOL joinCampaign(UDWORD gameNumber, char *sPlayer)
|
||||||
|
|
||||||
if(!ingame.localJoiningInProgress)
|
if(!ingame.localJoiningInProgress)
|
||||||
{
|
{
|
||||||
// game.type = CAMPAIGN;
|
|
||||||
NETjoinGame(gameNumber, sPlayer); // join
|
NETjoinGame(gameNumber, sPlayer); // join
|
||||||
ingame.localJoiningInProgress = TRUE;
|
ingame.localJoiningInProgress = TRUE;
|
||||||
|
|
||||||
|
@ -617,7 +616,6 @@ static BOOL cleanMap(UDWORD player)
|
||||||
// reverse so we always remove the last object. re-reverse afterwards.
|
// reverse so we always remove the last object. re-reverse afterwards.
|
||||||
// reverseObjectList((BASE_OBJECT**)&apsStructLists[player]);
|
// reverseObjectList((BASE_OBJECT**)&apsStructLists[player]);
|
||||||
|
|
||||||
|
|
||||||
switch(game.base)
|
switch(game.base)
|
||||||
{
|
{
|
||||||
case CAMP_CLEAN: //clean map
|
case CAMP_CLEAN: //clean map
|
||||||
|
|
Loading…
Reference in New Issue