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

Clean out some old unused stuff from multiplay.h 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3754 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2008-02-11 16:36:18 +00:00
parent 917187ca7d
commit eead0d470a
7 changed files with 4 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/configuration.c
View File

@ -409,17 +409,6 @@ BOOL loadConfig(void)
setWarzoneKeyNumeric("base", game.base);
}
//limit
if(getWarzoneKeyNumeric("limit", &val))
{
game.limit=(UBYTE)val;
}
else
{
game.limit = NOLIMIT;
setWarzoneKeyNumeric("limit", game.limit);
}
//maxplay
if(getWarzoneKeyNumeric("maxPlay", &val))
{
@ -636,7 +625,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("limit", game.limit); // limits
setWarzoneKeyNumeric("maxPlay", game.maxPlayers); // max no of players
setWarzoneKeyNumeric("alliance", game.alliance); // allow alliances
setWarzoneKeyString("forceName", sForceName); // force

4
src/game.c
View File

@ -439,7 +439,7 @@ static bool serializeMultiplayerGame(PHYSFS_file* fileHandle, const MULTIPLAYERG
|| !PHYSFS_writeUBE32(fileHandle, serializeMulti->power)
|| !PHYSFS_writeUBE8(fileHandle, serializeMulti->base)
|| !PHYSFS_writeUBE8(fileHandle, serializeMulti->alliance)
|| !PHYSFS_writeUBE8(fileHandle, serializeMulti->limit)
|| !PHYSFS_writeUBE8(fileHandle, 0)
|| !PHYSFS_writeUBE16(fileHandle, 0) // dummy, was bytesPerSec
|| !PHYSFS_writeUBE8(fileHandle, 0) // dummy, was packetsPerSec
|| !PHYSFS_writeUBE8(fileHandle, 0)) // dummy, was encryptKey
@ -470,7 +470,7 @@ static bool deserializeMultiplayerGame(PHYSFS_file* fileHandle, MULTIPLAYERGAME*
|| !PHYSFS_readUBE32(fileHandle, &serializeMulti->power)
|| !PHYSFS_readUBE8(fileHandle, &serializeMulti->base)
|| !PHYSFS_readUBE8(fileHandle, &serializeMulti->alliance)
|| !PHYSFS_readUBE8(fileHandle, &serializeMulti->limit)
|| !PHYSFS_readUBE8(fileHandle, &dummy8)
|| !PHYSFS_readUBE16(fileHandle, &dummy16) // dummy, was bytesPerSec
|| !PHYSFS_readUBE8(fileHandle, &dummy8) // dummy, was packetsPerSec
|| !PHYSFS_readUBE8(fileHandle, &dummy8)) // dummy, was encryptKey

33
src/multiint.c
View File

@ -1702,39 +1702,6 @@ static void processMultiopWidgets(UDWORD id)
sendOptions(0,0);
}
break;
case MULTIOP_NOLIMIT: // set power level to low
widgSetButtonState(psWScreen, MULTIOP_NOLIMIT,WBUT_LOCK);
widgSetButtonState(psWScreen, MULTIOP_FRAGLIMIT,0);
widgSetButtonState(psWScreen, MULTIOP_TIMELIMIT ,0);
game.limit = NOLIMIT;
if(bHosted)
{
sendOptions(0,0);
}
break;
case MULTIOP_FRAGLIMIT: // set power to med
widgSetButtonState(psWScreen, MULTIOP_NOLIMIT,0);
widgSetButtonState(psWScreen, MULTIOP_FRAGLIMIT,WBUT_LOCK);
widgSetButtonState(psWScreen, MULTIOP_TIMELIMIT ,0);
game.limit = FRAGLIMIT;
if(bHosted)
{
sendOptions(0,0);
}
break;
case MULTIOP_TIMELIMIT: // set power to hi
widgSetButtonState(psWScreen, MULTIOP_NOLIMIT,0);
widgSetButtonState(psWScreen, MULTIOP_FRAGLIMIT,0);
widgSetButtonState(psWScreen, MULTIOP_TIMELIMIT,WBUT_LOCK);
game.limit = TIMELIMIT;
if(bHosted)
{
sendOptions(0,0);
}
break;
}
}

5
src/multiint.h
View File

@ -302,11 +302,6 @@ void loadMapPreview(void);
#define MULTIOP_COLCHOOSER 10281
#define MULTIOP_COLCHOOSER_END 10288
#define MULTIOP_NOLIMIT 10289
#define MULTIOP_FRAGLIMIT 10290
#define MULTIOP_TIMELIMIT 10291
#define MULTIOP_LIMIT 10292 // 2 for this (+label)
#define MULTIOP_GAMETYPE 10294
#define MULTIOP_POWER 10296

9
src/multimenu.c
View File

@ -180,17 +180,12 @@ static BOOL enumerateMultiMaps(char *found, UDWORD *players,BOOL first, UBYTE ca
{
cam = 3;
}
// else if(lev->type == MULTI_SKIRMISHA)
// {
// cam = 0;
// }
else
{
cam = 1;
}
if((lev->type == SKIRMISH || lev->type == MULTI_SKIRMISH2 || lev->type == MULTI_SKIRMISH3)
// || lev->type == MULTI_SKIRMISHA)
&& (numPlayers == 0 || numPlayers == lev->players)
&& cam == camToUse )
{
@ -211,10 +206,6 @@ static BOOL enumerateMultiMaps(char *found, UDWORD *players,BOOL first, UBYTE ca
{
cam = 3;
}
// else if(lev->type == MULTI_CAMPAIGNA)
// {
// cam = 0;
// }
else
{
cam = 1;

2
src/multiopt.c
View File

@ -79,7 +79,6 @@ void sendOptions(uint32_t dest, uint32_t play)
NETuint32_t(&game.power);
NETuint8_t(&game.base);
NETuint8_t(&game.alliance);
NETuint8_t(&game.limit);
for (i = 0; i < MAX_PLAYERS; i++)
{
@ -177,7 +176,6 @@ void recvOptions()
NETuint32_t(&game.power);
NETuint8_t(&game.base);
NETuint8_t(&game.alliance);
NETuint8_t(&game.limit);
for (i = 0; i < MAX_PLAYERS; i++)
{

21
src/multiplay.h
View File

@ -106,9 +106,8 @@ typedef struct {
uint32_t power; // power level for arena game
uint8_t base; // clean/base/base&defence
uint8_t alliance; // no/yes/AIs vs Humans
uint8_t limit; // limit no/time/frag
uint8_t skDiff[MAX_PLAYERS]; // skirmish game difficulty settings.
} MULTIPLAYERGAME, *LPMULTIPLAYERGAME;
} MULTIPLAYERGAME;
typedef struct
{
@ -124,14 +123,11 @@ typedef struct {
BOOL JoiningInProgress[MAX_PLAYERS];
BOOL bHostSetup;
UDWORD startTime;
UDWORD modem; // modem to use.
UDWORD numStructureLimits; // number of limits
MULTISTRUCTLIMITS *pStructureLimits; // limits chunk.
UDWORD skScores[MAX_PLAYERS][2]; // score+kills for local skirmish players.
char phrases[5][255]; // 5 favourite text messages.
} MULTIPLAYERINGAME, *LPMULTIPLAYERINGAME;
} MULTIPLAYERINGAME;
// ////////////////////////////////////////////////////////////////////////////
@ -155,23 +151,13 @@ extern UBYTE bDisplayMultiJoiningStatus; // draw load progress?
#define ANYPLAYER 99
#define ONEPLAYER 98
//#define DMATCH 11 // to easily distinguish game types when joining.
#define CAMPAIGN 12
//#define TEAMPLAY 13
#define SKIRMISH 14
#define MULTI_SKIRMISH2 18
#define MULTI_SKIRMISH3 19
//#define MULTI_SKIRMISHA 20
#define MULTI_CAMPAIGN2 15
#define MULTI_CAMPAIGN3 16
//#define MULTI_CAMPAIGNA 17
#define NOLIMIT 0 // limit options for dmatch.
#define FRAGLIMIT 1
#define TIMELIMIT 2
#define CAMP_CLEAN 0 // campaign subtypes
#define CAMP_BASE 1
@ -181,7 +167,6 @@ extern UBYTE bDisplayMultiJoiningStatus; // draw load progress?
#define DEATHMATCHTEMPLATES 4 // game templates are stored in player x.
#define CAMPAIGNTEMPLATES 5
#define PING_LO 0 // this ping is kickin'.
#define PING_MED 600 // this ping is crusin'.
#define PING_HI 1200 // this ping is crawlin'.
@ -264,8 +249,6 @@ extern BOOL sendLeavingMsg (void);
extern BOOL hostCampaign (char *sGame, char *sPlayer);
extern BOOL joinCampaign (UDWORD gameNumber, char *playername);
//extern BOOL hostArena (char *sGame, char *sPlayer);
//extern BOOL joinArena (UDWORD gameNumber, char *playername);
extern void playerResponding (void);
extern BOOL multiGameInit (void);
extern BOOL multiGameShutdown (void);