diff --git a/src/doomstat.h b/src/doomstat.h index 300558131..321f42306 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -43,7 +43,6 @@ extern "C" { // Selected by user. extern INT16 gamemap; extern char mapmusname[7]; -extern UINT16 mapmusflags; extern UINT32 mapmusposition; extern UINT32 mapmusresume; extern UINT8 mapmusrng; diff --git a/src/g_game.c b/src/g_game.c index b5b7df905..3b42d85df 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -105,7 +105,6 @@ static void G_DoWorldDone(void); static void G_DoStartVote(void); char mapmusname[7]; // Music name -UINT16 mapmusflags; // Track and reset bit UINT32 mapmusposition; // Position to jump to UINT32 mapmusresume; UINT8 mapmusrng; // Random selection result @@ -5928,9 +5927,6 @@ void G_InitNew(UINT8 pencoremode, INT32 map, boolean resetplayer, boolean skippr gamemap = map; - // Don't carry over custom music change to another map. - mapmusflags |= MUSIC_RELOADRESET; - automapactive = false; imcontinuing = false; diff --git a/src/k_podium.cpp b/src/k_podium.cpp index 6635071a3..dbf4f16cb 100644 --- a/src/k_podium.cpp +++ b/src/k_podium.cpp @@ -1034,8 +1034,6 @@ void K_ResetCeremony(void) { mapmusrng--; } - - mapmusflags |= MUSIC_RELOADRESET; } if (!grandprixinfo.cup) diff --git a/src/lua_script.c b/src/lua_script.c index bd54fac61..d47df24dc 100644 --- a/src/lua_script.c +++ b/src/lua_script.c @@ -299,9 +299,6 @@ int LUA_PushGlobals(lua_State *L, const char *word) } else if (fastcmp(word,"mapmusname")) { lua_pushstring(L, mapmusname); return 1; - } else if (fastcmp(word,"mapmusflags")) { - lua_pushinteger(L, mapmusflags); - return 1; } else if (fastcmp(word,"mapmusposition")) { lua_pushinteger(L, mapmusposition); return 1; @@ -424,8 +421,6 @@ int LUA_WriteGlobals(lua_State *L, const char *word) strncpy(mapmusname, str, strlength); } - else if (fastcmp(word, "mapmusflags")) - mapmusflags = (UINT16)luaL_checkinteger(L, 2); else if (fastcmp(word, "mapmusrng")) mapmusrng = (UINT8)luaL_checkinteger(L, 2); // SRB2Kart diff --git a/src/p_saveg.c b/src/p_saveg.c index 9d727cdcc..afbdb0594 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -6428,11 +6428,6 @@ static boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading) if (!gamemap || gamemap > nummapheaders || !mapheaderinfo[gamemap-1]) I_Error("P_NetUnArchiveMisc: Internal map ID %d not found (nummapheaders = %d)", gamemap-1, nummapheaders); - // tell the sound code to reset the music since we're skipping what - // normally sets this flag - if (!reloading) - mapmusflags |= MUSIC_RELOADRESET; - G_SetGamestate(READINT16(save->p)); gametype = READINT16(save->p);