Kill spstage_start and spmarathon_start

This commit is contained in:
toaster 2022-09-23 13:07:59 +01:00
parent 1538055091
commit a4c73b204a
4 changed files with 1 additions and 31 deletions

View file

@ -2857,22 +2857,6 @@ void readmaincfg(MYFILE *f)
COM_BufInsertText(W_CacheLumpNum(lumpnum, PU_CACHE));
}
}
else if (fastcmp(word, "SPSTAGE_START"))
{
// TODO: Use map name string
// Haven't done it because of how special stage ends are handled
// Though, we likely won't be using these for Kart anyhow
INT16 maptmp = G_MapNumber(word2)+1;
if (maptmp <= nummapheaders)
spstage_start = spmarathon_start = maptmp;
}
else if (fastcmp(word, "SPMARATHON_START"))
{
INT16 maptmp = G_MapNumber(word2)+1;
if (maptmp <= nummapheaders)
spmarathon_start = maptmp;
}
else if (fastcmp(word, "REDTEAM"))
{
skincolor_redteam = (UINT16)get_number(word2);

View file

@ -205,9 +205,6 @@ extern INT32 splitscreen_party[MAXPLAYERS][MAXSPLITSCREENPLAYERS];
/* the only local one */
extern boolean splitscreen_partied[MAXPLAYERS];
// Maps of special importance
extern INT16 spstage_start, spmarathon_start;
extern char * titlemap;
extern boolean hidetitlepics;
extern char * bootmap; //bootmap for loading a map on startup

View file

@ -154,8 +154,6 @@ tic_t levelstarttic; // gametic at level start
INT16 lastmap; // last level you were at (returning from special stages)
tic_t timeinmap; // Ticker for time spent in level (used for levelcard display)
INT16 spstage_start, spmarathon_start;
char * titlemap = NULL;
boolean hidetitlepics = false;
char * bootmap = NULL; //bootmap for loading a map on startup
@ -3655,7 +3653,7 @@ static void G_HandleSaveLevel(void)
cursaveslot = 0;
}
else if ((!modifiedgame || savemoddata) && !(netgame || multiplayer || ultimatemode || demo.recording || metalrecording || modeattacking))
G_SaveGame((UINT32)cursaveslot, spstage_start);
G_SaveGame((UINT32)cursaveslot, 0); // TODO when we readd a campaign one day
}
}
// and doing THIS here means you don't lose your progress if you close the game mid-intermission
@ -4116,9 +4114,6 @@ void G_EndGame(void)
// Sets a tad of default info we need.
void G_LoadGameSettings(void)
{
// defaults
spstage_start = spmarathon_start = 1;
// initialize free sfx slots for skin sounds
S_InitRuntimeSounds();
}

View file

@ -211,12 +211,6 @@ int LUA_PushGlobals(lua_State *L, const char *word)
lua_pushinteger(L, cv_pointlimit.value);
return 1;
// begin map vars
} else if (fastcmp(word,"spstage_start")) {
lua_pushinteger(L, spstage_start);
return 1;
} else if (fastcmp(word,"spmarathon_start")) {
lua_pushinteger(L, spmarathon_start);
return 1;
} else if (fastcmp(word,"titlemap")) {
lua_pushstring(L, titlemap);
return 1;