start_time() time when game over
After getting game over, the game would be stopped when playing a demo or loading a saved game. This is now fixed.
This commit is contained in:
parent
dc090958d1
commit
b17a9f8550
|
@ -1462,9 +1462,10 @@ static window_event_result AdvanceLevel(int secret_flag)
|
||||||
|
|
||||||
window_event_result DoPlayerDead()
|
window_event_result DoPlayerDead()
|
||||||
{
|
{
|
||||||
|
const bool pause = !(((Game_mode & GM_MULTI) && (Newdemo_state != ND_STATE_PLAYBACK)) && (!Endlevel_sequence));
|
||||||
auto result = window_event_result::handled;
|
auto result = window_event_result::handled;
|
||||||
|
|
||||||
if (!(((Game_mode & GM_MULTI) && (Newdemo_state != ND_STATE_PLAYBACK)) && (!Endlevel_sequence)))
|
if (pause)
|
||||||
stop_time();
|
stop_time();
|
||||||
|
|
||||||
reset_palette_add();
|
reset_palette_add();
|
||||||
|
@ -1483,6 +1484,8 @@ window_event_result DoPlayerDead()
|
||||||
if (get_local_player().lives == 0)
|
if (get_local_player().lives == 0)
|
||||||
{
|
{
|
||||||
DoGameOver();
|
DoGameOver();
|
||||||
|
if (pause)
|
||||||
|
start_time();
|
||||||
return window_event_result::close;
|
return window_event_result::close;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1557,7 +1560,7 @@ window_event_result DoPlayerDead()
|
||||||
|
|
||||||
digi_sync_sounds();
|
digi_sync_sounds();
|
||||||
|
|
||||||
if (!(((Game_mode & GM_MULTI) && (Newdemo_state != ND_STATE_PLAYBACK)) && (!Endlevel_sequence)))
|
if (pause)
|
||||||
start_time();
|
start_time();
|
||||||
reset_time();
|
reset_time();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue