stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-18 02:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

MUSICPOSTBOSSPOSITION -> MUSICPOSTBOSSPOS

Browse source
This commit is contained in:
mazmazz 2018-08-25 16:18:09 -04:00
parent 21d08b39bf
commit ed8288a028
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dehacked.c
View file

@ -1158,8 +1158,8 @@ static void readlevelheader(MYFILE *f, INT32 num)
sizeof(mapheaderinfo[num-1]->muspostbossname), va("Level header %d: post-boss music", num)); sizeof(mapheaderinfo[num-1]->muspostbossname), va("Level header %d: post-boss music", num));
else if (fastcmp(word, "MUSICPOSTBOSSTRACK")) else if (fastcmp(word, "MUSICPOSTBOSSTRACK"))
mapheaderinfo[num-1]->muspostbosstrack = ((UINT16)i - 1); mapheaderinfo[num-1]->muspostbosstrack = ((UINT16)i - 1);
else if (fastcmp(word, "MUSICPOSTBOSSPOSITION")) else if (fastcmp(word, "MUSICPOSTBOSSPOS"))
mapheaderinfo[num-1]->muspostbossposition = (UINT8)get_number(word2); mapheaderinfo[num-1]->muspostbosspos = (UINT8)get_number(word2);
else if (fastcmp(word, "FORCECHARACTER")) else if (fastcmp(word, "FORCECHARACTER"))
{ {
strlcpy(mapheaderinfo[num-1]->forcecharacter, word2, SKINNAMESIZE+1); strlcpy(mapheaderinfo[num-1]->forcecharacter, word2, SKINNAMESIZE+1);

2
src/doomstat.h
View file

@ -262,7 +262,7 @@ typedef struct
// Music stuff. // Music stuff.
char muspostbossname[7]; ///< Post-bossdeath music. char muspostbossname[7]; ///< Post-bossdeath music.
UINT16 muspostbosstrack; ///< Post-bossdeath track. UINT16 muspostbosstrack; ///< Post-bossdeath track.
UINT32 muspostbossposition; ///< Post-bossdeath position UINT32 muspostbosspos; ///< Post-bossdeath position
// Lua stuff. // Lua stuff.
// (This is not ifdeffed so the map header structure can stay identical, just in case.) // (This is not ifdeffed so the map header structure can stay identical, just in case.)

4
src/lua_maplib.c
View file

@ -1764,8 +1764,8 @@ static int mapheaderinfo_get(lua_State *L)
lua_pushstring(L, header->muspostbossname); lua_pushstring(L, header->muspostbossname);
else if (fastcmp(field,"muspostbosstrack")) else if (fastcmp(field,"muspostbosstrack"))
lua_pushinteger(L, header->muspostbosstrack); lua_pushinteger(L, header->muspostbosstrack);
else if (fastcmp(field,"muspostbossposition")) else if (fastcmp(field,"muspostbosspos"))
lua_pushinteger(L, header->muspostbossposition); lua_pushinteger(L, header->muspostbosspos);
else if (fastcmp(field,"forcecharacter")) else if (fastcmp(field,"forcecharacter"))
lua_pushstring(L, header->forcecharacter); lua_pushstring(L, header->forcecharacter);
else if (fastcmp(field,"weather")) else if (fastcmp(field,"weather"))

2
src/p_enemy.c
View file

@ -3538,7 +3538,7 @@ void A_BossDeath(mobj_t *mo)
strncpy(mapmusname, mapheaderinfo[gamemap-1]->muspostbossname, 7); strncpy(mapmusname, mapheaderinfo[gamemap-1]->muspostbossname, 7);
mapmusname[6] = 0; mapmusname[6] = 0;
mapmusflags = (mapheaderinfo[gamemap-1]->muspostbosstrack & MUSIC_TRACKMASK) | MUSIC_RELOADRESET; mapmusflags = (mapheaderinfo[gamemap-1]->muspostbosstrack & MUSIC_TRACKMASK) | MUSIC_RELOADRESET;
mapmusposition = mapheaderinfo[gamemap-1]->muspostbossposition; mapmusposition = mapheaderinfo[gamemap-1]->muspostbosspos;
S_ChangeMusicAdvanced(mapmusname, mapmusflags, true, mapmusposition, (1*MUSICRATE)+(MUSICRATE/2), 0); S_ChangeMusicAdvanced(mapmusname, mapmusflags, true, mapmusposition, (1*MUSICRATE)+(MUSICRATE/2), 0);
} }
} }

2
src/p_setup.c
View file

@ -211,7 +211,7 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
mapheaderinfo[num]->musposition = 0; mapheaderinfo[num]->musposition = 0;
mapheaderinfo[num]->muspostbossname[6] = 0; mapheaderinfo[num]->muspostbossname[6] = 0;
mapheaderinfo[num]->muspostbosstrack = 0; mapheaderinfo[num]->muspostbosstrack = 0;
mapheaderinfo[num]->muspostbossposition = 0; mapheaderinfo[num]->muspostbosspos = 0;
mapheaderinfo[num]->forcecharacter[0] = '\0'; mapheaderinfo[num]->forcecharacter[0] = '\0';
mapheaderinfo[num]->weather = 0; mapheaderinfo[num]->weather = 0;
mapheaderinfo[num]->skynum = 1; mapheaderinfo[num]->skynum = 1;