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

* Remove constant MULTI_TYPE_START and replace it by an enumeration value: LDS_MULTI_TYPE_START 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4825 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-04-27 23:21:19 +00:00
parent e7269c9fce
commit 62d1a9e5fc
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/levels.c
View File

@ -47,9 +47,6 @@
#include "scripttabs.h"
#include "research.h"
// minimum type number for a type instruction
#define MULTI_TYPE_START 10
// block ID number start for the current level data (as opposed to a dataset)
#define CURRENT_DATAID LEVEL_MAXFILES
@ -236,7 +233,7 @@ BOOL levParse(const char* buffer, size_t size, searchPathMode datadir)
break;
case LTK_PLAYERS:
if (state == LP_LEVELDONE &&
(psDataSet->type == LDS_COMPLETE || psDataSet->type >= MULTI_TYPE_START))
(psDataSet->type == LDS_COMPLETE || psDataSet->type >= LDS_MULTI_TYPE_START>))
{
state = LP_PLAYERS;
}
@ -264,7 +261,7 @@ BOOL levParse(const char* buffer, size_t size, searchPathMode datadir)
}
else if (state == LP_TYPE)
{
if (levVal < MULTI_TYPE_START)
if (levVal < LDS_MULTI_TYPE_START>)
{
lev_error("invalid type number");
return false;
@ -663,7 +660,7 @@ BOOL levLoadData(const char* name, char *pSaveName, SDWORD saveType)
}
// initialise if necessary
if (psNewLevel->type == LDS_COMPLETE || //psNewLevel->type >= MULTI_TYPE_START ||
if (psNewLevel->type == LDS_COMPLETE || //psNewLevel->type >= LDS_MULTI_TYPE_START> ||
psBaseData != NULL)
{
debug(LOG_WZ, "levLoadData: Calling stageOneInitialise!");
@ -778,7 +775,7 @@ BOOL levLoadData(const char* name, char *pSaveName, SDWORD saveType)
if (psNewLevel->game == i)
{
// do some more initialising if necessary
if (psNewLevel->type == LDS_COMPLETE || psNewLevel->type >= MULTI_TYPE_START || (psBaseData != NULL && !bCamChangeSaveGame))
if (psNewLevel->type == LDS_COMPLETE || psNewLevel->type >= LDS_MULTI_TYPE_START> || (psBaseData != NULL && !bCamChangeSaveGame))
{
if (!stageTwoInitialise())
{
@ -878,7 +875,7 @@ BOOL levLoadData(const char* name, char *pSaveName, SDWORD saveType)
}
break;
default:
ASSERT( psNewLevel->type >= MULTI_TYPE_START,
ASSERT( psNewLevel->type >= LDS_MULTI_TYPE_START>,
"levLoadData: Unexpected mission type" );
debug(LOG_WZ, "levLoadData: default (MULTIPLAYER)");
if (!startMission(LDS_CAMSTART, psNewLevel->apDataFiles[i]))

1
src/levels.h
View File

@ -48,6 +48,7 @@ typedef enum
LDS_MKEEP_LIMBO, // off map saving any droids (selectedPlayer) at end into apsLimboDroids
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)
} LEVEL_TYPE;
// the WRF/WDG files needed for a particular level