zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-29 04:50:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: play the menu advance sound when starting a game

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-10 13:30:23 +02:00
parent 294a806793
commit 91e23b3ab5
5 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/core/cheats.cpp
View file

@ -252,11 +252,11 @@ void ChangeLevel(MapRecord* map, int skill)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void DeferedStartGame(MapRecord* map, int skill) void DeferedStartGame(MapRecord* map, int skill, bool nostopsound)
{ {
g_nextmap = map; g_nextmap = map;
g_nextskill = skill; g_nextskill = skill;
gameaction = ga_newgame; gameaction = nostopsound? ga_newgamenostopsound : ga_newgame;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

2
source/core/gamecontrol.h
View file

@ -56,7 +56,7 @@ int GetAutomapZoom(int gZoom);
void DrawCrosshair(int deftile, int health, double xdelta, double ydelta, double scale, PalEntry color = 0xffffffff); void DrawCrosshair(int deftile, int health, double xdelta, double ydelta, double scale, PalEntry color = 0xffffffff);
void updatePauseStatus(); void updatePauseStatus();
void DeferedStartGame(MapRecord* map, int skill); void DeferedStartGame(MapRecord* map, int skill, bool nostopsound = false);
void ChangeLevel(MapRecord* map, int skill); void ChangeLevel(MapRecord* map, int skill);
void CompleteLevel(MapRecord* map); void CompleteLevel(MapRecord* map);

3
source/core/gamestate.h
View file

@ -41,7 +41,8 @@ enum gameaction_t : int
ga_autosave, // autosave the game (for triggering a save from within the game.) ga_autosave, // autosave the game (for triggering a save from within the game.)
ga_completed, // Level was exited. ga_completed, // Level was exited.
ga_nextlevel, // Actually start the next level. ga_nextlevel, // Actually start the next level.
ga_loadgamehidecon ga_loadgamehidecon,
ga_newgamenostopsound, // start a new game
}; };
extern gamestate_t gamestate; extern gamestate_t gamestate;
extern gameaction_t gameaction; extern gameaction_t gameaction;

3
source/core/mainloop.cpp
View file

@ -187,8 +187,9 @@ static void GameTicker()
break; break;
case ga_newgame: case ga_newgame:
newGameStarted = true;
FX_StopAllSounds(); FX_StopAllSounds();
case ga_newgamenostopsound:
newGameStarted = true;
FX_SetReverb(0); FX_SetReverb(0);
gi->FreeLevelData(); gi->FreeLevelData();
C_ClearMessages(); C_ClearMessages();

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

@ -76,7 +76,7 @@ void GameInterface::QuitToTitle()
bool GameInterface::StartGame(FNewGameStartup& gs) bool GameInterface::StartGame(FNewGameStartup& gs)
{ {
auto map = FindMapByLevelNum(gs.Skill); // 0 is training, 1 is the regular game - the game does not have skill levels. auto map = FindMapByLevelNum(gs.Skill); // 0 is training, 1 is the regular game - the game does not have skill levels.
DeferedStartGame(map, 1); DeferedStartGame(map, 1, true);
return true; return true;
} }