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

Fix clang warnings. Remove support for "campaign" multiplayer maps (never used).

master
Per Inge Mathisen 2013-03-15 09:42:12 +01:00
parent a0874b2244
commit 7c52f5cbe8
3 changed files with 8 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/levels.h
View File

@ -47,6 +47,11 @@ enum LEVEL_TYPE
LDS_NONE, //flags when not got a mission to go back to or when
//already on one - ****LEAVE AS LAST ONE****
LDS_MULTI_TYPE_START, ///< Start number for custom type numbers (as used by a `type` instruction)
CAMPAIGN = 12,
SKIRMISH = 14,
MULTI_SKIRMISH2 = 18,
MULTI_SKIRMISH3 = 19
};
struct LEVEL_DATASET

34
src/multimenu.cpp
View File

@ -198,13 +198,13 @@ static LEVEL_DATASET *enumerateMultiMaps(bool first, unsigned camToUse, unsigned
}
while(lev)
{
if(game.type == SKIRMISH)
if (game.type == SKIRMISH)
{
if(lev->type == MULTI_SKIRMISH2)
if (lev->type == MULTI_SKIRMISH2)
{
cam = 2;
}
else if(lev->type == MULTI_SKIRMISH3)
else if (lev->type == MULTI_SKIRMISH3)
{
cam = 3;
}
@ -212,7 +212,6 @@ static LEVEL_DATASET *enumerateMultiMaps(bool first, unsigned camToUse, unsigned
{
cam = 1;
}
if((lev->type == SKIRMISH || lev->type == MULTI_SKIRMISH2 || lev->type == MULTI_SKIRMISH3)
&& (numPlayers == 0 || numPlayers == lev->players)
&& cam == camToUse )
@ -223,33 +222,6 @@ static LEVEL_DATASET *enumerateMultiMaps(bool first, unsigned camToUse, unsigned
return found;
}
}
else // campaign
{
// 'service pack 1'
if(lev->type == MULTI_CAMPAIGN2)
{
cam = 2;
}
else if(lev->type == MULTI_CAMPAIGN3)
{
cam = 3;
}
else
{
cam = 1;
}
// end of service pack
if ((lev->type == CAMPAIGN || lev->type == MULTI_CAMPAIGN2 || lev->type == MULTI_CAMPAIGN3)
&& (numPlayers == 0 || numPlayers == lev->players)
&& cam == camToUse )
{
LEVEL_DATASET *found = lev;
lev = lev->psNext;
return found;
}
}
lev = lev->psNext;
}

8
src/multiplay.h
View File

@ -105,14 +105,6 @@ extern UBYTE bDisplayMultiJoiningStatus; // draw load progress?
#define ANYPLAYER 99
#define CAMPAIGN 12
#define SKIRMISH 14
#define MULTI_SKIRMISH2 18
#define MULTI_SKIRMISH3 19
#define MULTI_CAMPAIGN2 15
#define MULTI_CAMPAIGN3 16
#define CAMP_CLEAN 0 // campaign subtypes
#define CAMP_BASE 1
#define CAMP_WALLS 2