(#1148) Disable pause mode after reloading the level

diff --git a/src/game.c b/src/game.c
index 25bf0f1d712736ad898b62a9d8bd01317aefbd38..522cb71a20e735cfbc56ed8090229c51d859cf7c 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -283,6 +283,10 @@ static int game_event_running(Game *game, const SDL_Event *event)
                     return -1;
                 }
 
+                level_disable_pause_mode(
+                    game->level,
+                    &game->camera,
+                    game->sound_samples);
                 camera_disable_debug_mode(&game->camera);
             } break;
 

diff --git a/src/game/level.c b/src/game/level.c
index 47da3c9f2f0e26da1b1c18595f6a540204599ccd..dc843675c90fc50c2e61d7d5827059c0e2d8dde6 100644 (file)
--- a/src/game/level.c
+++ b/src/game/level.c
@@ -360,3 +360,14 @@ int level_enter_camera_event(Level *level, Camera *camera)
     labels_enter_camera_event(level->labels, camera);
     return 0;
 }
+
+void level_disable_pause_mode(Level *level, Camera *camera,
+                              Sound_samples *sound_samples)
+{
+    trace_assert(level);
+    trace_assert(camera);
+    trace_assert(sound_samples);
+    level->state = LEVEL_STATE_IDLE;
+    camera->blackwhite_mode = false;
+    sound_samples_toggle_pause(sound_samples);
+}

diff --git a/src/game/level.h b/src/game/level.h
index 5343015485cb0c95fbf0a3c8ba823002b45f9628..59ed102cc8a3ef345713ea96a3a5857b4f8ff7f0 100644 (file)
--- a/src/game/level.h
+++ b/src/game/level.h
@@ -26,6 +26,7 @@ int level_input(Level *level,
                 SDL_Joystick *the_stick_of_joy);
 int level_enter_camera_event(Level *level, Camera *camera);
 
-void level_toggle_pause_mode(Level *level);
+void level_disable_pause_mode(Level *level, Camera *camera,
+                              Sound_samples *sound_samples);
 
 #endif  // LEVEL_H_