(#68) Wire up boxes entity

[nothing.git] / src / game / level.c

diff --git a/src/game/level.c b/src/game/level.c
index e5a228e9d9f5fb34e4edc05a617e2d152912b717..ed78896ce714c27ce907f9a473a128456282ce17 100644 (file)
--- a/src/game/level.c
+++ b/src/game/level.c
@@ -1,14 +1,16 @@
-#include <assert.h>
 #include <SDL2/SDL.h>
+#include <assert.h>
 
-#include "./lt.h"
-#include "./game/level/player.h"
-#include "./game/level/platforms.h"
-#include "./game/level.h"
-#include "./game/level/camera.h"
-#include "./error.h"
-#include "./game/level/goals.h"
-#include "./lava.h"
+#include "game/camera.h"
+#include "game/level.h"
+#include "game/level/background.h"
+#include "game/level/boxes.h"
+#include "game/level/goals.h"
+#include "game/level/lava.h"
+#include "game/level/platforms.h"
+#include "game/level/player.h"
+#include "system/error.h"
+#include "system/lt.h"
 
 /* TODO(#118): Level doesn't play the Nothing and Something sounds when the goal get into view */
 
@@ -17,10 +19,12 @@ struct level_t
     lt_t *lt;
     player_t *player;
     platforms_t *platforms;
-    camera_t *camera;
     goals_t *goals;
     lava_t *lava;
     color_t background_color;
+    platforms_t *back_platforms;
+    background_t *background;
+    boxes_t *boxes;
 };
 
 level_t *create_level_from_file(const char *file_name)
@@ -71,8 +75,18 @@ level_t *create_level_from_file(const char *file_name)
         RETURN_LT(lt, NULL);
     }
 
-    level->camera = PUSH_LT(lt, create_camera(vec(0.0f, 0.0f)), destroy_camera);
-    if (level->camera == NULL) {
+    level->back_platforms = PUSH_LT(lt, create_platforms_from_stream(level_file), destroy_platforms);
+    if (level->back_platforms == NULL) {
+        RETURN_LT(lt, NULL);
+    }
+
+    level->boxes = PUSH_LT(lt, create_boxes_from_stream(level_file), destroy_boxes);
+    if (level->boxes == NULL) {
+        RETURN_LT(lt, NULL);
+    }
+
+    level->background = PUSH_LT(lt, create_background(level->background_color), destroy_background);
+    if (level->background == NULL) {
         RETURN_LT(lt, NULL);
     }
 
@@ -89,28 +103,41 @@ void destroy_level(level_t *level)
     RETURN_LT0(level->lt);
 }
 
-int level_render(const level_t *level, SDL_Renderer *renderer)
+int level_render(const level_t *level, camera_t *camera)
 {
     assert(level);
-    assert(renderer);
 
-    if (camera_clear_background(level->camera, renderer, level->background_color) < 0) {
+    player_focus_camera(level->player, camera);
+
+    if (camera_clear_background(camera, level->background_color) < 0) {
+        return -1;
+    }
+
+    if (background_render(level->background, camera) < 0) {
+        return -1;
+    }
+
+    if (platforms_render(level->back_platforms, camera) < 0) {
+        return -1;
+    }
+
+    if (player_render(level->player, camera) < 0) {
         return -1;
     }
 
-    if (player_render(level->player, renderer, level->camera) < 0) {
+    if (boxes_render(level->boxes, camera) < 0) {
         return -1;
     }
 
-    if (lava_render(level->lava, renderer, level->camera) < 0) {
+    if (lava_render(level->lava, camera) < 0) {
         return -1;
     }
 
-    if (platforms_render(level->platforms, renderer, level->camera) < 0) {
+    if (platforms_render(level->platforms, camera) < 0) {
         return -1;
     }
 
-    if (goals_render(level->goals, renderer, level->camera) < 0) {
+    if (goals_render(level->goals, camera) < 0) {
         return -1;
     }
 
@@ -118,7 +145,7 @@ int level_render(const level_t *level, SDL_Renderer *renderer)
      *
      * But I simply couldn't find a better place for it.
      */
-    goals_cue(level->goals, renderer, level->camera);
+    goals_cue(level->goals, camera);
 
     return 0;
 }
@@ -128,8 +155,9 @@ int level_update(level_t *level, float delta_time)
     assert(level);
     assert(delta_time > 0);
 
+    boxes_update(level->boxes, level->platforms, delta_time);
     player_update(level->player, level->platforms, delta_time);
-    player_focus_camera(level->player, level->camera);
+
     player_hide_goals(level->player, level->goals);
     player_die_from_lava(level->player, level->lava);
 
@@ -187,16 +215,6 @@ int level_input(level_t *level,
     return 0;
 }
 
-void level_toggle_debug_mode(level_t *level)
-{
-    camera_toggle_debug_mode(level->camera);
-}
-
-void level_toggle_pause_mode(level_t *level)
-{
-    camera_toggle_blackwhite_mode(level->camera);
-}
-
 int level_reload_preserve_player(level_t *level, const char *file_name)
 {
     lt_t * const lt = create_lt();
@@ -241,13 +259,30 @@ int level_reload_preserve_player(level_t *level, const char *file_name)
     if (lava == NULL) {
         RETURN_LT(lt, -1);
     }
+    level->lava = RESET_LT(level->lt, level->lava, lava);
+
+    platforms_t * const back_platforms = create_platforms_from_stream(level_file);
+    if (back_platforms == NULL) {
+        RETURN_LT(lt, -1);
+    }
+    level->back_platforms = RESET_LT(level->lt, level->back_platforms, back_platforms);
+
+    boxes_t * const boxes = create_boxes_from_stream(level_file);
+    if (level->boxes == NULL) {
+        RETURN_LT(lt, -1);
+    }
+    level->boxes = RESET_LT(level->lt, level->boxes, boxes);
 
     RETURN_LT(lt, 0);
 }
 
-int level_sound(level_t *level, sound_medium_t *sound_medium)
+int level_sound(level_t *level, sound_samples_t *sound_samples)
 {
-    if (goals_sound(level->goals, sound_medium) < 0) {
+    if (goals_sound(level->goals, sound_samples) < 0) {
+        return -1;
+    }
+
+    if (player_sound(level->player, sound_samples) < 0) {
         return -1;
     }