mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2025-01-30 04:50:55 +00:00
Merge branch 'public-gl-next' into public-musicplus-feature-endoflevel
This commit is contained in:
commit
a1ccb8512d
3 changed files with 14 additions and 6 deletions
|
@ -1491,9 +1491,7 @@ static int mapheaderinfo_get(lua_State *L)
|
||||||
if (!header->interscreen[i])
|
if (!header->interscreen[i])
|
||||||
break;
|
break;
|
||||||
lua_pushlstring(L, header->interscreen, i);
|
lua_pushlstring(L, header->interscreen, i);
|
||||||
} else if (fastcmp(field,"musicinterfadeout"))
|
} else if (fastcmp(field,"runsoc"))
|
||||||
lua_pushinteger(L, header->musicinterfadeout);
|
|
||||||
else if (fastcmp(field,"runsoc"))
|
|
||||||
lua_pushstring(L, header->runsoc);
|
lua_pushstring(L, header->runsoc);
|
||||||
else if (fastcmp(field,"scriptname"))
|
else if (fastcmp(field,"scriptname"))
|
||||||
lua_pushstring(L, header->scriptname);
|
lua_pushstring(L, header->scriptname);
|
||||||
|
|
|
@ -8828,7 +8828,7 @@ void P_PlayerThink(player_t *player)
|
||||||
// so we can fade music
|
// so we can fade music
|
||||||
if (!exitfadestarted &&
|
if (!exitfadestarted &&
|
||||||
player->exiting > 0 && player->exiting <= 1*TICRATE &&
|
player->exiting > 0 && player->exiting <= 1*TICRATE &&
|
||||||
(!multiplayer || gametype == GT_COOP ? !mapheaderinfo[gamemap-1]->musicinterfadeout : true) &&
|
(!multiplayer || gametype == GT_COOP ? !mapheaderinfo[gamemap-1]->musinterfadeout : true) &&
|
||||||
// don't fade if we're fading during intermission. follows Y_StartIntermission intertype = int_coop
|
// don't fade if we're fading during intermission. follows Y_StartIntermission intertype = int_coop
|
||||||
(gametype == GT_RACE || gametype == GT_COMPETITION ? countdown2 == 0 : true) && // don't fade on timeout
|
(gametype == GT_RACE || gametype == GT_COMPETITION ? countdown2 == 0 : true) && // don't fade on timeout
|
||||||
player->lives > 0 && // don't fade on game over (competition)
|
player->lives > 0 && // don't fade on game over (competition)
|
||||||
|
|
|
@ -697,7 +697,12 @@ void Y_Ticker(void)
|
||||||
|
|
||||||
if (!intertic) // first time only
|
if (!intertic) // first time only
|
||||||
{
|
{
|
||||||
if (mapheaderinfo[gamemap-1]->musinterfadeout)
|
if (mapheaderinfo[gamemap-1]->musinterfadeout
|
||||||
|
#ifdef _WIN32
|
||||||
|
// can't fade midi due to win32 volume hack
|
||||||
|
&& S_MusicType() != MU_MID
|
||||||
|
#endif
|
||||||
|
)
|
||||||
S_FadeOutStopMusic(mapheaderinfo[gamemap-1]->musinterfadeout);
|
S_FadeOutStopMusic(mapheaderinfo[gamemap-1]->musinterfadeout);
|
||||||
else if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
|
else if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
|
||||||
S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it
|
S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it
|
||||||
|
@ -764,7 +769,12 @@ void Y_Ticker(void)
|
||||||
|
|
||||||
if (!intertic) // first time only
|
if (!intertic) // first time only
|
||||||
{
|
{
|
||||||
if (mapheaderinfo[gamemap-1]->musinterfadeout)
|
if (mapheaderinfo[gamemap-1]->musinterfadeout
|
||||||
|
#ifdef _WIN32
|
||||||
|
// can't fade midi due to win32 volume hack
|
||||||
|
&& S_MusicType() != MU_MID
|
||||||
|
#endif
|
||||||
|
)
|
||||||
S_FadeOutStopMusic(mapheaderinfo[gamemap-1]->musinterfadeout);
|
S_FadeOutStopMusic(mapheaderinfo[gamemap-1]->musinterfadeout);
|
||||||
else if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
|
else if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
|
||||||
S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it
|
S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it
|
||||||
|
|
Loading…
Reference in a new issue