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

diff --git a/src/game.c b/src/game.c
index 7542f438..73dcc184 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,12 +1,13 @@
 #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"
 #include "./lt.h"
 
 typedef enum game_state_t {
@@ -21,9 +22,7 @@ typedef struct game_t {
     lt_t *lt;
 
     game_state_t state;
-    player_t *player;
-    platforms_t *platforms;
-    camera_t *camera;
+    level_t *level;
     char *level_file_path;
 } game_t;
 
@@ -42,18 +41,11 @@ game_t *create_game(const char *level_file_path)
         RETURN_LT(lt, NULL);
     }
 
-    game->player = PUSH_LT(lt, create_player(100.0f, 0.0f), destroy_player);
-    if (game->player == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    game->platforms = PUSH_LT(lt, load_platforms_from_file(level_file_path), destroy_platforms);
-    if (game->platforms == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    game->camera = PUSH_LT(lt, create_camera(vec(0.0f, 0.0f)), destroy_camera);
-    if (game->camera == NULL) {
+    game->level = PUSH_LT(
+        lt,
+        create_level_from_file(level_file_path),
+        destroy_level);
+    if (game->level == NULL) {
         RETURN_LT(lt, NULL);
     }
 
@@ -86,21 +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 (render_player(game->player, renderer, game->camera) < 0) {
-        return -1;
-    }
-
-    if (render_platforms(game->platforms, renderer, game->camera) < 0) {
+    if (level_render(game->level, renderer) < 0) {
         return -1;
     }
 
@@ -119,8 +97,7 @@ int game_update(game_t *game, Uint32 delta_time)
     }
 
     if (game->state == GAME_STATE_RUNNING) {
-        update_player(game->player, game->platforms, delta_time);
-        player_focus_camera(game->player, game->camera);
+        return level_update(game->level, delta_time);
     }
 
     return 0;
@@ -141,12 +118,16 @@ 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);
             break;
         }
         break;
     }
 
-    return 0;
+    return level_event(game->level, event);
 }
 
 static int game_event_running(game_t *game, const SDL_Event *event)
@@ -161,19 +142,25 @@ static int game_event_running(game_t *game, const SDL_Event *event)
 
     case SDL_KEYDOWN:
         switch (event->key.keysym.sym) {
-        case SDLK_SPACE:
-            player_jump(game->player);
-            break;
+        case SDLK_r:
+            printf("Reloading the level from '%s'...\n", game->level_file_path);
 
-        case SDLK_q:
-            printf("Reloading the level from '%s'...", game->level_file_path);
-
-            game->platforms = RESET_LT(
+            game->level = RESET_LT(
                 game->lt,
-                game->platforms,
-                load_platforms_from_file(game->level_file_path));
+                game->level,
+                create_level_from_file(
+                    game->level_file_path));
 
-            if (game->platforms == NULL) {
+            if (game->level == NULL) {
+                print_current_error_msg("Could not reload the level");
+                game->state = GAME_STATE_QUIT;
+                return -1;
+            }
+            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;
@@ -182,18 +169,18 @@ static int game_event_running(game_t *game, const SDL_Event *event)
 
         case SDLK_p:
             game->state = GAME_STATE_PAUSE;
+            level_toggle_pause_mode(game->level);
             break;
-        }
-        break;
 
-    case SDL_JOYBUTTONDOWN:
-        if (event->jbutton.button == 1) {
-            player_jump(game->player);
+        case SDLK_l:
+            level_toggle_debug_mode(game->level);
+            break;
         }
         break;
+
     }
 
-    return 0;
+    return level_event(game->level, event);
 }
 
 int game_event(game_t *game, const SDL_Event *event)
@@ -221,28 +208,15 @@ int game_input(game_t *game,
 {
     assert(game);
     assert(keyboard_state);
-    assert(the_stick_of_joy);
 
     if (game->state == GAME_STATE_QUIT || game->state == GAME_STATE_PAUSE) {
         return 0;
     }
 
-    if (keyboard_state[SDL_SCANCODE_A]) {
-        player_move_left(game->player);
-    } else if (keyboard_state[SDL_SCANCODE_D]) {
-        player_move_right(game->player);
-    } else if (the_stick_of_joy && SDL_JoystickGetAxis(the_stick_of_joy, 0) < 0) {
-        player_move_left(game->player);
-    } else if (the_stick_of_joy && SDL_JoystickGetAxis(the_stick_of_joy, 0) > 0) {
-        player_move_right(game->player);
-    } else {
-        player_stop(game->player);
-    }
-
-    return 0;
+    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;
 }