diff --git a/src/dehacked.c b/src/dehacked.c index dc0d94e0a..858b0b67c 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -1158,8 +1158,8 @@ static void readlevelheader(MYFILE *f, INT32 num) sizeof(mapheaderinfo[num-1]->muspostbossname), va("Level header %d: post-boss music", num)); else if (fastcmp(word, "MUSICPOSTBOSSTRACK")) mapheaderinfo[num-1]->muspostbosstrack = ((UINT16)i - 1); - else if (fastcmp(word, "MUSICPOSTBOSSPOSITION")) - mapheaderinfo[num-1]->muspostbossposition = (UINT8)get_number(word2); + else if (fastcmp(word, "MUSICPOSTBOSSPOS")) + mapheaderinfo[num-1]->muspostbosspos = (UINT8)get_number(word2); else if (fastcmp(word, "FORCECHARACTER")) { strlcpy(mapheaderinfo[num-1]->forcecharacter, word2, SKINNAMESIZE+1); diff --git a/src/doomstat.h b/src/doomstat.h index 7d83e75f1..cb6798884 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -262,7 +262,7 @@ typedef struct // Music stuff. char muspostbossname[7]; ///< Post-bossdeath music. UINT16 muspostbosstrack; ///< Post-bossdeath track. - UINT32 muspostbossposition; ///< Post-bossdeath position + UINT32 muspostbosspos; ///< Post-bossdeath position // Lua stuff. // (This is not ifdeffed so the map header structure can stay identical, just in case.) diff --git a/src/lua_maplib.c b/src/lua_maplib.c index 49add3713..d90bc3a03 100644 --- a/src/lua_maplib.c +++ b/src/lua_maplib.c @@ -1764,8 +1764,8 @@ static int mapheaderinfo_get(lua_State *L) lua_pushstring(L, header->muspostbossname); else if (fastcmp(field,"muspostbosstrack")) lua_pushinteger(L, header->muspostbosstrack); - else if (fastcmp(field,"muspostbossposition")) - lua_pushinteger(L, header->muspostbossposition); + else if (fastcmp(field,"muspostbosspos")) + lua_pushinteger(L, header->muspostbosspos); else if (fastcmp(field,"forcecharacter")) lua_pushstring(L, header->forcecharacter); else if (fastcmp(field,"weather")) diff --git a/src/p_enemy.c b/src/p_enemy.c index d8d1557ca..eae86c785 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3538,7 +3538,7 @@ void A_BossDeath(mobj_t *mo) strncpy(mapmusname, mapheaderinfo[gamemap-1]->muspostbossname, 7); mapmusname[6] = 0; 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); } } diff --git a/src/p_setup.c b/src/p_setup.c index 0cb5fbd85..28efb0c26 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -211,7 +211,7 @@ static void P_ClearSingleMapHeaderInfo(INT16 i) mapheaderinfo[num]->musposition = 0; mapheaderinfo[num]->muspostbossname[6] = 0; mapheaderinfo[num]->muspostbosstrack = 0; - mapheaderinfo[num]->muspostbossposition = 0; + mapheaderinfo[num]->muspostbosspos = 0; mapheaderinfo[num]->forcecharacter[0] = '\0'; mapheaderinfo[num]->weather = 0; mapheaderinfo[num]->skynum = 1;