Merge pull request #1255 from tsoding/1253

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

diff --git a/src/game/level/lava.c b/src/game/level/lava.c
index d68737d876380298f6813f93f715666e6d653cc4..ec580d4c075fe526ffac321a4f0ba7d5ee13990e 100644 (file)
--- a/src/game/level/lava.c
+++ b/src/game/level/lava.c
@@ -7,7 +7,6 @@
 #include "lava.h"
 #include "math/rect.h"
 #include "system/lt.h"
-#include "system/line_stream.h"
 #include "system/nth_alloc.h"
 #include "system/log.h"
 #include "game/level/level_editor/rect_layer.h"
@@ -20,42 +19,6 @@ struct Lava {
     Wavy_rect **rects;
 };
 
-Lava *create_lava_from_line_stream(LineStream *line_stream)
-{
-    trace_assert(line_stream);
-
-    Lt *lt = create_lt();
-
-    Lava *lava = PUSH_LT(lt, nth_calloc(1, sizeof(Lava)), free);
-    if (lava == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    if (sscanf(
-            line_stream_next(line_stream),
-            "%lu",
-            &lava->rects_count) < 0) {
-        log_fail("Could not read amount of lavas\n");
-        RETURN_LT(lt, NULL);
-    }
-
-    lava->rects = PUSH_LT(lt, nth_calloc(1, sizeof(Wavy_rect*) * lava->rects_count), free);
-    if (lava->rects == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    for (size_t i = 0; i < lava->rects_count; ++i) {
-        lava->rects[i] = PUSH_LT(lt, create_wavy_rect_from_line_stream(line_stream), destroy_wavy_rect);
-        if (lava->rects[i] == NULL) {
-            RETURN_LT(lt, NULL);
-        }
-    }
-
-    lava->lt = lt;
-
-    return lava;
-}
-
 Lava *create_lava_from_rect_layer(const RectLayer *rect_layer)
 {
     Lt *lt = create_lt();
@@ -92,7 +55,7 @@ void destroy_lava(Lava *lava)
 
 /* TODO(#449): lava does not render its id in debug mode */
 int lava_render(const Lava *lava,
-                Camera *camera)
+                const Camera *camera)
 {
     trace_assert(lava);
     trace_assert(camera);