thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 19:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove mapmusflags

Browse source
This commit is contained in:
James R 2023-11-27 05:38:20 -08:00
parent a578f9b37c
commit d3f9c6e826
5 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/doomstat.h
View file

@ -43,7 +43,6 @@ extern "C" {
// Selected by user. // Selected by user.
extern INT16 gamemap; extern INT16 gamemap;
extern char mapmusname[7]; extern char mapmusname[7];
extern UINT16 mapmusflags;
extern UINT32 mapmusposition; extern UINT32 mapmusposition;
extern UINT32 mapmusresume; extern UINT32 mapmusresume;
extern UINT8 mapmusrng; extern UINT8 mapmusrng;

4
src/g_game.c
View file

@ -105,7 +105,6 @@ static void G_DoWorldDone(void);
static void G_DoStartVote(void); static void G_DoStartVote(void);
char mapmusname[7]; // Music name char mapmusname[7]; // Music name
UINT16 mapmusflags; // Track and reset bit
UINT32 mapmusposition; // Position to jump to UINT32 mapmusposition; // Position to jump to
UINT32 mapmusresume; UINT32 mapmusresume;
UINT8 mapmusrng; // Random selection result UINT8 mapmusrng; // Random selection result
@ -5928,9 +5927,6 @@ void G_InitNew(UINT8 pencoremode, INT32 map, boolean resetplayer, boolean skippr
gamemap = map; gamemap = map;
// Don't carry over custom music change to another map.
mapmusflags |= MUSIC_RELOADRESET;
automapactive = false; automapactive = false;
imcontinuing = false; imcontinuing = false;

2
src/k_podium.cpp
View file

@ -1034,8 +1034,6 @@ void K_ResetCeremony(void)
{ {
mapmusrng--; mapmusrng--;
} }
mapmusflags |= MUSIC_RELOADRESET;
} }
if (!grandprixinfo.cup) if (!grandprixinfo.cup)

5
src/lua_script.c
View file

@ -299,9 +299,6 @@ int LUA_PushGlobals(lua_State *L, const char *word)
} else if (fastcmp(word,"mapmusname")) { } else if (fastcmp(word,"mapmusname")) {
lua_pushstring(L, mapmusname); lua_pushstring(L, mapmusname);
return 1; return 1;
} else if (fastcmp(word,"mapmusflags")) {
lua_pushinteger(L, mapmusflags);
return 1;
} else if (fastcmp(word,"mapmusposition")) { } else if (fastcmp(word,"mapmusposition")) {
lua_pushinteger(L, mapmusposition); lua_pushinteger(L, mapmusposition);
return 1; return 1;
@ -424,8 +421,6 @@ int LUA_WriteGlobals(lua_State *L, const char *word)
strncpy(mapmusname, str, strlength); strncpy(mapmusname, str, strlength);
} }
else if (fastcmp(word, "mapmusflags"))
mapmusflags = (UINT16)luaL_checkinteger(L, 2);
else if (fastcmp(word, "mapmusrng")) else if (fastcmp(word, "mapmusrng"))
mapmusrng = (UINT8)luaL_checkinteger(L, 2); mapmusrng = (UINT8)luaL_checkinteger(L, 2);
// SRB2Kart // SRB2Kart

5
src/p_saveg.c
View file

@ -6428,11 +6428,6 @@ static boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading)
if (!gamemap || gamemap > nummapheaders || !mapheaderinfo[gamemap-1]) if (!gamemap || gamemap > nummapheaders || !mapheaderinfo[gamemap-1])
I_Error("P_NetUnArchiveMisc: Internal map ID %d not found (nummapheaders = %d)", gamemap-1, nummapheaders); 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)); G_SetGamestate(READINT16(save->p));
gametype = READINT16(save->p); gametype = READINT16(save->p);