zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-26 02:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

- stop all playing sound when starting a new game.

Browse source 
- give all bonus screen sounds in Duke the CHANF_UI flag.
This commit is contained in:
Christoph Oelckers 2020-02-17 19:43:58 +01:00
parent a657b55b50
commit 7dc26a3162
11 changed files with 66 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/blood/src/d_menu.cpp
View file

@ -40,6 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "mmulti.h"
#include "c_bind.h"
#include "menu/menu.h"
#include "sfx.h"
bool ShowOptionMenu();
@ -255,6 +256,7 @@ bool GameInterface::CanSave()
void GameInterface::StartGame(FGameStartup& gs)
{
sfxKillAllSounds();
gGameOptions.nDifficulty = gs.Skill;
gGameOptions.nEpisode = gs.Episode;
gSkill = gs.Skill;

1
source/common/menu/menu.cpp
View file

@ -485,6 +485,7 @@ bool M_SetMenu(FName menu, int param, FName caller)
if (caller == NAME_MainMenu) GameStartupInfo.Episode = param;
STAT_StartNewGame(gVolumeNames[GameStartupInfo.Episode], GameStartupInfo.Skill);
inputState.ClearAllInput();
gi->StartGame(GameStartupInfo);
return false;

1
source/duke3d/src/d_menu.cpp
View file

@ -518,6 +518,7 @@ void GameInterface::StartGame(FGameStartup& gs)
{
int32_t skillsound = PISTOL_BODYHIT;
soundEngine->StopAllChannels();
switch (gs.Skill)
{
case 0:

46
source/duke3d/src/screens.cpp
View file

@ -1220,7 +1220,7 @@ void gameDisplayTitleScreen(void)
if (titlesound == 0)
{
titlesound++;
S_PlaySound(PIPEBOMB_EXPLODE);
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
rotatesprite_fs(160 << 16, 104 << 16, ((int32_t) totalclock - 120) << 10, 0, DUKENUKEM, 0, 0, 2 + 8);
}
@ -1237,7 +1237,7 @@ void gameDisplayTitleScreen(void)
if (titlesound == 1)
{
titlesound++;
S_PlaySound(PIPEBOMB_EXPLODE);
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
rotatesprite_fs(160 << 16, (104) << 16, 60 << 10, 0, DUKENUKEM, 0, 0, 2 + 8);
@ -1259,7 +1259,7 @@ void gameDisplayTitleScreen(void)
if (titlesound == 2)
{
titlesound++;
S_PlaySound(FLY_BY);
S_PlaySound(FLY_BY, CHAN_AUTO, CHANF_UI);
}
}
else if (totalclock >= 395)
@ -1267,7 +1267,7 @@ void gameDisplayTitleScreen(void)
if (titlesound == 3)
{
titlesound++;
S_PlaySound(PIPEBOMB_EXPLODE);
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
rotatesprite_fs(160 << 16, (151) << 16, 30 << 11, 0, PLUTOPAKSPRITE + 1, (sintable[((int32_t) totalclock << 4) & 2047] >> 11), 0,
2 + 8);
@ -1373,7 +1373,7 @@ void G_DisplayLogo(void)
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0);
if ((G_GetLogoFlags() & LOGO_STOPMISCSOUNDS) == 0)
S_PlaySound(NITEVISION_ONOFF);
S_PlaySound(NITEVISION_ONOFF, CHAN_AUTO, CHANF_UI);
//G_FadePalette(0,0,0,0);
videoClearScreen(0L);
@ -1446,8 +1446,8 @@ static void G_BonusCutscenes(void)
{
if (t==10 && bonuscnt == 1)
{
S_PlaySound(SHOTGUN_FIRE);
S_PlaySound(SQUISHED);
S_PlaySound(SHOTGUN_FIRE, CHAN_AUTO, CHANF_UI);
S_PlaySound(SQUISHED, CHAN_AUTO, CHANF_UI);
bonuscnt++;
}
rotatesprite_fs(bossmove[t+3]<<16, bossmove[t+4]<<16, 65536L, 0, bossmove[t+2], 0, 0, 2+8+16+64+128+BGSTRETCH);
@ -1469,7 +1469,7 @@ static void G_BonusCutscenes(void)
rotatesprite_fs(86<<16, 59<<16, 65536L, 0, VICTORY1+8, 0, 0, 2+8+16+64+128+BGSTRETCH);
if (totalclock >= 750 && bonuscnt == 2)
{
S_PlaySound(DUKETALKTOBOSS);
S_PlaySound(DUKETALKTOBOSS, CHAN_AUTO, CHANF_UI);
bonuscnt++;
}
@ -1479,7 +1479,7 @@ static void G_BonusCutscenes(void)
{
if (t==5 && bonuscnt == 0)
{
S_PlaySound(BOSSTALKTODUKE);
S_PlaySound(BOSSTALKTODUKE, CHAN_AUTO, CHANF_UI);
bonuscnt++;
}
rotatesprite_fs(breathe[t+3]<<16, breathe[t+4]<<16, 65536L, 0, breathe[t+2], 0, 0, 2+8+16+64+128+BGSTRETCH);
@ -1531,7 +1531,7 @@ static void G_BonusCutscenes(void)
videoClearScreen(0L);
videoNextPage();
S_PlaySound(PIPEBOMB_EXPLODE);
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
fadepal(0, 0, 0, 0, 252, 4);
}
@ -1585,7 +1585,7 @@ static void G_BonusCutscenes(void)
FX_StopAllSounds();
S_ClearSoundLocks();
S_PlaySound(ENDSEQVOL3SND4);
S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI);
inputState.ClearAllInput();
if (G_GetLogoFlags() & LOGO_NODUKETEAMTEXT)
@ -1687,7 +1687,7 @@ static void G_BonusCutscenes(void)
{
FX_StopAllSounds();
S_ClearSoundLocks();
S_PlaySound(ENDSEQVOL3SND4);
S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI);
videoClearScreen(0L);
videoNextPage();
@ -1892,7 +1892,7 @@ void G_BonusScreen(int32_t bonusonly)
G_DisplayMPResultsScreen();
if (MusicEnabled() && mus_enabled)
S_PlaySound(BONUSMUSIC);
S_PlaySound(BONUSMUSIC, CHAN_AUTO, CHANF_UI);
videoNextPage();
inputState.ClearAllInput();
@ -1931,7 +1931,7 @@ void G_BonusScreen(int32_t bonusonly)
gametext_center_shade(192, GStrings("PRESSKEY"), quotepulseshade);
if (MusicEnabled() && mus_enabled)
S_PlaySound(BONUSMUSIC);
S_PlaySound(BONUSMUSIC, CHAN_AUTO, CHANF_UI);
videoNextPage();
inputState.ClearAllInput();
@ -1960,20 +1960,20 @@ void G_BonusScreen(int32_t bonusonly)
if (bonuscnt == 6)
{
bonuscnt++;
S_PlaySound(SHOTGUN_COCK);
S_PlaySound(SHOTGUN_COCK, CHAN_AUTO, CHANF_UI);
switch (rand()&3)
{
case 0:
S_PlaySound(BONUS_SPEECH1);
S_PlaySound(BONUS_SPEECH1, CHAN_AUTO, CHANF_UI);
break;
case 1:
S_PlaySound(BONUS_SPEECH2);
S_PlaySound(BONUS_SPEECH2, CHAN_AUTO, CHANF_UI);
break;
case 2:
S_PlaySound(BONUS_SPEECH3);
S_PlaySound(BONUS_SPEECH3, CHAN_AUTO, CHANF_UI);
break;
case 3:
S_PlaySound(BONUS_SPEECH4);
S_PlaySound(BONUS_SPEECH4, CHAN_AUTO, CHANF_UI);
break;
}
}
@ -2047,7 +2047,7 @@ void G_BonusScreen(int32_t bonusonly)
if (bonuscnt == 1)
{
bonuscnt++;
S_PlaySound(PIPEBOMB_EXPLODE);
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
if (g_player[myconnectindex].ps->player_par > 0)
@ -2097,7 +2097,7 @@ void G_BonusScreen(int32_t bonusonly)
if (bonuscnt == 2)
{
bonuscnt++;
S_PlaySound(FLY_BY);
S_PlaySound(FLY_BY, CHAN_AUTO, CHANF_UI);
}
yy = zz;
@ -2107,7 +2107,7 @@ void G_BonusScreen(int32_t bonusonly)
if (bonuscnt == 3)
{
bonuscnt++;
S_PlaySound(PIPEBOMB_EXPLODE);
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
Bsprintf(tempbuf, "%-3d", g_player[myconnectindex].ps->actors_killed);
gametext_number((320>>2)+70, yy+9, tempbuf);
@ -2143,7 +2143,7 @@ void G_BonusScreen(int32_t bonusonly)
if (bonuscnt == 5)
{
bonuscnt++;
S_PlaySound(PIPEBOMB_EXPLODE);
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
Bsprintf(tempbuf, "%-3d", g_player[myconnectindex].ps->secret_rooms);
gametext_number((320>>2)+70, yy+9, tempbuf);

1
source/duke3d/src/sounds.h
View file

@ -62,7 +62,6 @@ void S_ContinueLevelMusic(void);
int S_PlaySound(int num, int channel = CHAN_AUTO, EChanFlags flags = 0);
int S_PlaySound3D(int num, int spriteNum, const vec3_t *pos, int channel = CHAN_AUTO, EChanFlags flags = 0);
void S_StopEnvSound(int sndNum,int sprNum, int flags = -1);
void S_StopAllSounds(void);
void S_Update(void);
void S_ChangeSoundPitch(int soundNum, int spriteNum, int pitchoffset);
int S_GetUserFlags(int sndnum);

1
source/rr/src/d_menu.cpp
View file

@ -420,6 +420,7 @@ void GameInterface::StartGame(FGameStartup& gs)
{
int32_t skillsound = PISTOL_BODYHIT;
soundEngine->StopAllChannels();
switch (gs.Skill)
{
case 0:

2
source/rr/src/net.cpp
View file

@ -3310,7 +3310,7 @@ void Net_ReceiveMessage(uint8_t *pbuf, int32_t packbufleng)
recbuf[packbufleng-2] = 0;
G_AddUserQuote(recbuf);
S_PlaySound(EXITMENUSOUND);
S_PlaySound(EXITMENUSOUND, CHAN_AUTO, CHANF_UI);
pus = pub = NUMPAGES;
}

70
source/rr/src/screens.cpp
View file

@ -61,7 +61,7 @@ static void G_HandleEventsWhileNoInput(void)
static int32_t G_PlaySoundWhileNoInput(int32_t soundnum)
{
S_PlaySound(soundnum);
S_PlaySound(soundnum, CHAN_AUTO, CHANF_UI);
inputState.ClearAllInput();
while (S_CheckSoundPlaying(-1, soundnum))
{
@ -1209,7 +1209,7 @@ void G_DisplayLogo(void)
//g_player[myconnectindex].ps->palette = palette;
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); // JBF 20040308
S_PlaySound(NITEVISION_ONOFF);
S_PlaySound(NITEVISION_ONOFF, CHAN_AUTO, CHANF_UI);
//G_FadePalette(0,0,0,0);
videoClearScreen(0L);
@ -1311,7 +1311,7 @@ void G_DisplayLogo(void)
if (soundanm == 0)
{
soundanm++;
S_PlaySound(PIPEBOMB_EXPLODE);
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
rotatesprite_fs(160<<16, 104<<16, ((int32_t) totalclock-120)<<10, 0, DUKENUKEM, 0, 0, 2+8);
}
@ -1323,7 +1323,7 @@ void G_DisplayLogo(void)
if (soundanm == 1)
{
soundanm++;
S_PlaySound(PIPEBOMB_EXPLODE);
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
rotatesprite_fs(160<<16, (104)<<16, 60<<10, 0, DUKENUKEM, 0, 0, 2+8);
@ -1341,7 +1341,7 @@ void G_DisplayLogo(void)
if (soundanm == 2)
{
soundanm++;
S_PlaySound(FLY_BY);
S_PlaySound(FLY_BY, CHAN_AUTO, CHANF_UI);
}
}
else if (totalclock >= 395)
@ -1349,7 +1349,7 @@ void G_DisplayLogo(void)
if (soundanm == 3)
{
soundanm++;
S_PlaySound(PIPEBOMB_EXPLODE);
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
rotatesprite_fs(160<<16, (151)<<16, 30<<11, 0, PLUTOPAKSPRITE+1, (sintable[((int32_t) totalclock<<4)&2047]>>11), 0, 2+8);
}
@ -1370,7 +1370,7 @@ void G_DisplayLogo(void)
//g_player[myconnectindex].ps->palette = palette;
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); // JBF 20040308
S_PlaySound(NITEVISION_ONOFF);
S_PlaySound(NITEVISION_ONOFF, CHAN_AUTO, CHANF_UI);
//G_FadePalette(0,0,0,0);
videoClearScreen(0L);
@ -1502,8 +1502,8 @@ static void G_BonusCutscenes(void)
{
if (t==10 && bonuscnt == 1)
{
S_PlaySound(SHOTGUN_FIRE);
S_PlaySound(SQUISHED);
S_PlaySound(SHOTGUN_FIRE, CHAN_AUTO, CHANF_UI);
S_PlaySound(SQUISHED, CHAN_AUTO, CHANF_UI);
bonuscnt++;
}
rotatesprite_fs(bossmove[t+3]<<16, bossmove[t+4]<<16, 65536L, 0, bossmove[t+2], 0, 0, 2+8+16+64+128+BGSTRETCH);
@ -1525,7 +1525,7 @@ static void G_BonusCutscenes(void)
rotatesprite_fs(86<<16, 59<<16, 65536L, 0, VICTORY1+8, 0, 0, 2+8+16+64+128+BGSTRETCH);
if (totalclock >= 750 && bonuscnt == 2)
{
S_PlaySound(DUKETALKTOBOSS);
S_PlaySound(DUKETALKTOBOSS, CHAN_AUTO, CHANF_UI);
bonuscnt++;
}
@ -1535,7 +1535,7 @@ static void G_BonusCutscenes(void)
{
if (t==5 && bonuscnt == 0)
{
S_PlaySound(BOSSTALKTODUKE);
S_PlaySound(BOSSTALKTODUKE, CHAN_AUTO, CHANF_UI);
bonuscnt++;
}
rotatesprite_fs(breathe[t+3]<<16, breathe[t+4]<<16, 65536L, 0, breathe[t+2], 0, 0, 2+8+16+64+128+BGSTRETCH);
@ -1581,7 +1581,7 @@ static void G_BonusCutscenes(void)
videoClearScreen(0L);
videoNextPage();
S_PlaySound(PIPEBOMB_EXPLODE);
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
fadepal(0, 0, 0, 0, 252, 4);
}
@ -1626,7 +1626,7 @@ static void G_BonusCutscenes(void)
end_vol4e:
FX_StopAllSounds();
S_ClearSoundLocks();
S_PlaySound(ENDSEQVOL3SND4);
S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI);
inputState.ClearAllInput();
G_FadePalette(0, 0, 0, 0);
@ -1710,7 +1710,7 @@ static void G_BonusCutscenes(void)
{
FX_StopAllSounds();
S_ClearSoundLocks();
S_PlaySound(ENDSEQVOL3SND4);
S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI);
videoClearScreen(0L);
videoNextPage();
@ -1909,7 +1909,7 @@ void G_BonusScreen(int32_t bonusonly)
G_DisplayMPResultsScreen();
if (MusicEnabled() && mus_enabled)
S_PlaySound(BONUSMUSIC);
S_PlaySound(BONUSMUSIC, CHAN_AUTO, CHANF_UI);
videoNextPage();
inputState.ClearAllInput();
@ -1951,7 +1951,7 @@ void G_BonusScreen(int32_t bonusonly)
gametext_center_shade(192, GStrings("PRESSKEY"), quotepulseshade);
if (MusicEnabled() && mus_enabled)
S_PlaySound(BONUSMUSIC);
S_PlaySound(BONUSMUSIC, CHAN_AUTO, CHANF_UI);
}
else
{
@ -1998,20 +1998,20 @@ void G_BonusScreen(int32_t bonusonly)
if (bonuscnt == 6)
{
bonuscnt++;
S_PlaySound(RR ? 425 : SHOTGUN_COCK);
S_PlaySound(RR ? 425 : SHOTGUN_COCK, CHAN_AUTO, CHANF_UI);
switch (rand()&3)
{
case 0:
S_PlaySound(BONUS_SPEECH1);
S_PlaySound(BONUS_SPEECH1, CHAN_AUTO, CHANF_UI);
break;
case 1:
S_PlaySound(BONUS_SPEECH2);
S_PlaySound(BONUS_SPEECH2, CHAN_AUTO, CHANF_UI);
break;
case 2:
S_PlaySound(BONUS_SPEECH3);
S_PlaySound(BONUS_SPEECH3, CHAN_AUTO, CHANF_UI);
break;
case 3:
S_PlaySound(BONUS_SPEECH4);
S_PlaySound(BONUS_SPEECH4, CHAN_AUTO, CHANF_UI);
break;
}
}
@ -2112,7 +2112,7 @@ void G_BonusScreen(int32_t bonusonly)
if (bonuscnt == 1)
{
bonuscnt++;
S_PlaySound(RR ? 404 : PIPEBOMB_EXPLODE);
S_PlaySound(RR ? 404 : PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
if (g_player[myconnectindex].ps->player_par > 0)
@ -2189,7 +2189,7 @@ void G_BonusScreen(int32_t bonusonly)
{
bonuscnt++;
if (!RR)
S_PlaySound(FLY_BY);
S_PlaySound(FLY_BY, CHAN_AUTO, CHANF_UI);
}
yy = zz;
@ -2199,7 +2199,7 @@ void G_BonusScreen(int32_t bonusonly)
if (bonuscnt == 3)
{
bonuscnt++;
S_PlaySound(RR ? 422 : PIPEBOMB_EXPLODE);
S_PlaySound(RR ? 422 : PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
Bsprintf(tempbuf, "%-3d", g_player[myconnectindex].ps->actors_killed);
if (!RR)
@ -2250,7 +2250,7 @@ void G_BonusScreen(int32_t bonusonly)
if (bonuscnt == 5)
{
bonuscnt++;
S_PlaySound(RR ? 404 : PIPEBOMB_EXPLODE);
S_PlaySound(RR ? 404 : PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
}
Bsprintf(tempbuf, "%-3d", g_player[myconnectindex].ps->secret_rooms);
if (!RR)
@ -2488,7 +2488,7 @@ void G_BonusScreenRRRA(int32_t bonusonly)
G_DisplayMPResultsScreen();
if (MusicEnabled() && mus_enabled)
S_PlaySound(BONUSMUSIC);
S_PlaySound(BONUSMUSIC, CHAN_AUTO, CHANF_UI);
videoNextPage();
inputState.ClearAllInput();
@ -2577,20 +2577,20 @@ void G_BonusScreenRRRA(int32_t bonusonly)
if (bonuscnt == 6)
{
bonuscnt++;
S_PlaySound(425);
S_PlaySound(425, CHAN_AUTO, CHANF_UI);
switch (rand()&3)
{
case 0:
S_PlaySound(BONUS_SPEECH1);
S_PlaySound(BONUS_SPEECH1, CHAN_AUTO, CHANF_UI);
break;
case 1:
S_PlaySound(BONUS_SPEECH2);
S_PlaySound(BONUS_SPEECH2, CHAN_AUTO, CHANF_UI);
break;
case 2:
S_PlaySound(BONUS_SPEECH3);
S_PlaySound(BONUS_SPEECH3, CHAN_AUTO, CHANF_UI);
break;
case 3:
S_PlaySound(BONUS_SPEECH4);
S_PlaySound(BONUS_SPEECH4, CHAN_AUTO, CHANF_UI);
break;
}
}
@ -2659,7 +2659,7 @@ void G_BonusScreenRRRA(int32_t bonusonly)
if (bonuscnt == 1)
{
bonuscnt++;
S_PlaySound(404);
S_PlaySound(404, CHAN_AUTO, CHANF_UI);
}
if (g_player[myconnectindex].ps->player_par > 0)
@ -2716,7 +2716,7 @@ void G_BonusScreenRRRA(int32_t bonusonly)
if (bonuscnt == 3)
{
bonuscnt++;
S_PlaySound(422);
S_PlaySound(422, CHAN_AUTO, CHANF_UI);
}
Bsprintf(tempbuf, "%-3d", g_player[myconnectindex].ps->actors_killed);
menutext(231,yy,tempbuf);
@ -2752,7 +2752,7 @@ void G_BonusScreenRRRA(int32_t bonusonly)
if (bonuscnt == 5)
{
bonuscnt++;
S_PlaySound(404);
S_PlaySound(404, CHAN_AUTO, CHANF_UI);
}
Bsprintf(tempbuf, "%-3d", g_player[myconnectindex].ps->secret_rooms);
menutext(231, yy, tempbuf);
@ -2791,7 +2791,7 @@ void G_BonusScreenRRRA(int32_t bonusonly)
fadepal(0, 0, 0, 0, 252, 4);
videoClearScreen(0L);
videoNextPage();
S_PlaySound(35);
S_PlaySound(35, CHAN_AUTO, CHANF_UI);
G_FadePalette(0, 0, 0, 0);
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0);
while (1)

1
source/rr/src/sounds.h
View file

@ -62,7 +62,6 @@ void S_ContinueLevelMusic(void);
int S_PlaySound(int num, int channel = CHAN_AUTO, EChanFlags flags = 0);
int S_PlaySound3D(int num, int spriteNum, const vec3_t *pos, int channel = CHAN_AUTO, EChanFlags flags = 0);
void S_StopEnvSound(int sndNum,int sprNum, int flags = -1);
void S_StopAllSounds(void);
void S_Update(void);
void S_ChangeSoundPitch(int soundNum, int spriteNum, int pitchoffset);
int S_GetUserFlags(int sndnum);

1
source/sw/src/d_menu.cpp
View file

@ -233,6 +233,7 @@ void GameInterface::StartGame(FGameStartup& gs)
DemoMode = FALSE;
CameraTestMode = FALSE;
Skill = gs.Skill;
StopFX();
//InitNewGame();

1
source/sw/src/save.cpp
View file

@ -726,6 +726,7 @@ bool GameInterface::LoadGame(FSaveGameNode* sv)
int StateNdx;
int StateEndNdx;
StopFX();
Saveable_Init();
auto filr = ReadSavegameChunk("snapshot.sw");