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

diff --git a/src/game.c b/src/game.c
index 779add85..73dcc184 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,10 +1,10 @@
 #include <stdio.h>
 #include <assert.h>
 #include <SDL2/SDL.h>
+#include <SDL2/SDL_mixer.h>
 
 #include "./player.h"
 #include "./platforms.h"
-#include "./camera.h"
 #include "./game.h"
 #include "./error.h"
 #include "./level.h"
@@ -23,7 +23,6 @@ typedef struct game_t {
 
     game_state_t state;
     level_t *level;
-    camera_t *camera;
     char *level_file_path;
 } game_t;
 
@@ -50,11 +49,6 @@ game_t *create_game(const char *level_file_path)
         RETURN_LT(lt, NULL);
     }
 
-    game->camera = PUSH_LT(lt, create_camera(vec(0.0f, 0.0f)), destroy_camera);
-    if (game->camera == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
     game->level_file_path = PUSH_LT(lt, malloc(sizeof(char) * (strlen(level_file_path) + 1)), free);
     if (game->level_file_path == NULL) {
         throw_error(ERROR_TYPE_LIBC);
@@ -84,17 +78,7 @@ 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, game->camera, renderer) < 0) {
+    if (level_render(game->level, renderer) < 0) {
         return -1;
     }
 
@@ -113,7 +97,7 @@ int game_update(game_t *game, Uint32 delta_time)
     }
 
     if (game->state == GAME_STATE_RUNNING) {
-        return level_update(game->level, game->camera, delta_time);
+        return level_update(game->level, delta_time);
     }
 
     return 0;
@@ -134,9 +118,10 @@ 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:
-            camera_toggle_debug_mode(game->camera);
+            level_toggle_debug_mode(game->level);
             break;
         }
         break;
@@ -157,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");
@@ -172,12 +158,22 @@ 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:
-            camera_toggle_debug_mode(game->camera);
+            level_toggle_debug_mode(game->level);
             break;
         }
         break;
@@ -220,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;
 }