X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgame.c;h=73dcc1843dd151f6f46c018201892d0b170f1659;hb=1b6e46a6589c6f3a5c8f52d6948b5f254e6d304b;hp=70693506401b881198c583974e391c8b2ea8e787;hpb=113cffc01e30b2b8a13b346ba7a20a757620490a;p=nothing.git

diff --git a/src/game.c b/src/game.c
index 70693506..73dcc184 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <SDL2/SDL.h>
+#include <SDL2/SDL_mixer.h>
 
 #include "./player.h"
 #include "./platforms.h"
@@ -77,16 +78,6 @@ int game_render(const game_t *game, SDL_Renderer *renderer)
         return 0;
     }
 
-    if (SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255) < 0) {
-        throw_error(ERROR_TYPE_SDL2);
-        return -1;
-    }
-
-    if (SDL_RenderClear(renderer) < 0) {
-        throw_error(ERROR_TYPE_SDL2);
-        return -1;
-    }
-
     if (level_render(game->level, renderer) < 0) {
         return -1;
     }
@@ -127,6 +118,7 @@ static int game_event_pause(game_t *game, const SDL_Event *event)
         switch (event->key.keysym.sym) {
         case SDLK_p:
             game->state = GAME_STATE_RUNNING;
+            level_toggle_pause_mode(game->level);
             break;
         case SDLK_l:
             level_toggle_debug_mode(game->level);
@@ -150,13 +142,14 @@ static int game_event_running(game_t *game, const SDL_Event *event)
 
     case SDL_KEYDOWN:
         switch (event->key.keysym.sym) {
-        case SDLK_q:
+        case SDLK_r:
             printf("Reloading the level from '%s'...\n", game->level_file_path);
 
             game->level = RESET_LT(
                 game->lt,
                 game->level,
-                create_level_from_file(game->level_file_path));
+                create_level_from_file(
+                    game->level_file_path));
 
             if (game->level == NULL) {
                 print_current_error_msg("Could not reload the level");
@@ -165,8 +158,18 @@ static int game_event_running(game_t *game, const SDL_Event *event)
             }
             break;
 
+        case SDLK_q:
+            printf("Reloading the level's platforms from '%s'...\n", game->level_file_path);
+            if (level_reload_preserve_player(game->level, game->level_file_path) < 0) {
+                print_current_error_msg("Could not reload the level");
+                game->state = GAME_STATE_QUIT;
+                return -1;
+            }
+            break;
+
         case SDLK_p:
             game->state = GAME_STATE_PAUSE;
+            level_toggle_pause_mode(game->level);
             break;
 
         case SDLK_l:
@@ -213,7 +216,7 @@ int game_input(game_t *game,
     return level_input(game->level, keyboard_state, the_stick_of_joy);
 }
 
-int is_game_over(const game_t *game)
+int game_over_check(const game_t *game)
 {
     return game->state == GAME_STATE_QUIT;
 }