Oops! Apparently my search&replace regexp for r4825 contained a small typo causing a syntax error: fixed it
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4826 4a71c877-e1ca-e34f-864e-861f7616d084master
parent
62d1a9e5fc
commit
16cd0c108e
|
@ -233,7 +233,7 @@ BOOL levParse(const char* buffer, size_t size, searchPathMode datadir)
|
||||||
break;
|
break;
|
||||||
case LTK_PLAYERS:
|
case LTK_PLAYERS:
|
||||||
if (state == LP_LEVELDONE &&
|
if (state == LP_LEVELDONE &&
|
||||||
(psDataSet->type == LDS_COMPLETE || psDataSet->type >= LDS_MULTI_TYPE_START>))
|
(psDataSet->type == LDS_COMPLETE || psDataSet->type >= LDS_MULTI_TYPE_START))
|
||||||
{
|
{
|
||||||
state = LP_PLAYERS;
|
state = LP_PLAYERS;
|
||||||
}
|
}
|
||||||
|
@ -261,7 +261,7 @@ BOOL levParse(const char* buffer, size_t size, searchPathMode datadir)
|
||||||
}
|
}
|
||||||
else if (state == LP_TYPE)
|
else if (state == LP_TYPE)
|
||||||
{
|
{
|
||||||
if (levVal < LDS_MULTI_TYPE_START>)
|
if (levVal < LDS_MULTI_TYPE_START)
|
||||||
{
|
{
|
||||||
lev_error("invalid type number");
|
lev_error("invalid type number");
|
||||||
return false;
|
return false;
|
||||||
|
@ -775,7 +775,7 @@ BOOL levLoadData(const char* name, char *pSaveName, SDWORD saveType)
|
||||||
if (psNewLevel->game == i)
|
if (psNewLevel->game == i)
|
||||||
{
|
{
|
||||||
// do some more initialising if necessary
|
// do some more initialising if necessary
|
||||||
if (psNewLevel->type == LDS_COMPLETE || psNewLevel->type >= LDS_MULTI_TYPE_START> || (psBaseData != NULL && !bCamChangeSaveGame))
|
if (psNewLevel->type == LDS_COMPLETE || psNewLevel->type >= LDS_MULTI_TYPE_START || (psBaseData != NULL && !bCamChangeSaveGame))
|
||||||
{
|
{
|
||||||
if (!stageTwoInitialise())
|
if (!stageTwoInitialise())
|
||||||
{
|
{
|
||||||
|
@ -875,7 +875,7 @@ BOOL levLoadData(const char* name, char *pSaveName, SDWORD saveType)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
ASSERT( psNewLevel->type >= LDS_MULTI_TYPE_START>,
|
ASSERT( psNewLevel->type >= LDS_MULTI_TYPE_START,
|
||||||
"levLoadData: Unexpected mission type" );
|
"levLoadData: Unexpected mission type" );
|
||||||
debug(LOG_WZ, "levLoadData: default (MULTIPLAYER)");
|
debug(LOG_WZ, "levLoadData: default (MULTIPLAYER)");
|
||||||
if (!startMission(LDS_CAMSTART, psNewLevel->apDataFiles[i]))
|
if (!startMission(LDS_CAMSTART, psNewLevel->apDataFiles[i]))
|
||||||
|
|
Loading…
Reference in New Issue