Remove dead LineStream related code

diff --git a/src/game/level/background.h b/src/game/level/background.h
index 15e5a8f8f2632d5cf536d9c00f2276c03ed0fecb..83bb6517f7fa09823011061539ad10dfe95e50c0 100644 (file)
--- a/src/game/level/background.h
+++ b/src/game/level/background.h
@@ -6,8 +6,6 @@
 #include "color.h"
 #include "game/camera.h"
 
-typedef struct LineStream LineStream;
-
 typedef struct {
     Color base_color;
 } Background;

diff --git a/src/game/level/boxes.h b/src/game/level/boxes.h
index 4f30cab4d679ffc998ad0dc2215cb5563682abee..85ccfc06147d937dd01745453d4115631b48fb5f 100644 (file)
--- a/src/game/level/boxes.h
+++ b/src/game/level/boxes.h
@@ -7,7 +7,6 @@
 
 typedef struct Boxes Boxes;
 typedef struct Player Player;
-typedef struct LineStream LineStream;
 typedef struct Player Player;
 typedef struct RectLayer RectLayer;
 

diff --git a/src/game/level/goals.c b/src/game/level/goals.c
index d91bbf6814f4fb82d26af99f433f25b657590c46..885383d0e064e3fc1b591e3cf9d1bcc28a183387 100644 (file)
--- a/src/game/level/goals.c
+++ b/src/game/level/goals.c
@@ -35,83 +35,6 @@ struct Goals {
     float angle;
 };
 
-Goals *create_goals_from_line_stream(LineStream *line_stream)
-{
-    trace_assert(line_stream);
-
-    Lt *lt = create_lt();
-
-    Goals *const goals = PUSH_LT(lt, nth_calloc(1, sizeof(Goals)), free);
-    if (goals == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    goals->count = 0;
-    if (sscanf(
-            line_stream_next(line_stream),
-            "%zu",
-            &goals->count) == EOF) {
-        log_fail("Could not read amount of goals\n");
-        RETURN_LT(lt, NULL);
-    }
-
-    goals->ids = PUSH_LT(
-        lt,
-        nth_calloc(1, sizeof(char*) * goals->count),
-        free);
-    if (goals->ids == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-    for (size_t i = 0; i < goals->count; ++i) {
-        goals->ids[i] = PUSH_LT(lt, nth_calloc(1, sizeof(char) * ENTITY_MAX_ID_SIZE), free);
-        if (goals->ids[i] == NULL) {
-            RETURN_LT(lt, NULL);
-        }
-    }
-
-    goals->positions = PUSH_LT(lt, nth_calloc(1, sizeof(Vec2f) * goals->count), free);
-    if (goals->positions == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    goals->colors = PUSH_LT(lt, nth_calloc(1, sizeof(Color) * goals->count), free);
-    if (goals->colors == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    goals->cue_states = PUSH_LT(lt, nth_calloc(1, sizeof(int) * goals->count), free);
-    if (goals->cue_states == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    goals->visible = PUSH_LT(lt, nth_calloc(1, sizeof(bool) * goals->count), free);
-    if (goals->visible == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    char color[7];
-    for (size_t i = 0; i < goals->count; ++i) {
-        if (sscanf(
-                line_stream_next(line_stream),
-                "%" STRINGIFY(ENTITY_MAX_ID_SIZE) "s%f%f%6s",
-                goals->ids[i],
-                &goals->positions[i].x,
-                &goals->positions[i].y,
-                color) < 0) {
-            log_fail("Could not read %dth goal\n", i);
-            RETURN_LT(lt, NULL);
-        }
-        goals->colors[i] = hexstr(color);
-        goals->cue_states[i] = CUE_STATE_VIRGIN;
-        goals->visible[i] = true;
-    }
-
-    goals->lt = lt;
-    goals->angle = 0.0f;
-
-    return goals;
-}
-
 Goals *create_goals_from_point_layer(const PointLayer *point_layer)
 {
     trace_assert(point_layer);

diff --git a/src/game/level/goals.h b/src/game/level/goals.h
index 203c643bd99610de154317a1d2d3a2077667a990..013fbd41d610997240aa39021b19014398d9b225 100644 (file)
--- a/src/game/level/goals.h
+++ b/src/game/level/goals.h
@@ -9,10 +9,8 @@
 #include "config.h"
 
 typedef struct Goals Goals;
-typedef struct LineStream LineStream;
 typedef struct PointLayer PointLayer;
 
-Goals *create_goals_from_line_stream(LineStream *line_stream);
 Goals *create_goals_from_point_layer(const PointLayer *point_layer);
 void destroy_goals(Goals *goals);
 

diff --git a/src/game/level/labels.c b/src/game/level/labels.c
index d8b841afae52c23b0051da54ede48d311956b19c..95ea708775fe2f2b184209775de286888f404271 100644 (file)
--- a/src/game/level/labels.c
+++ b/src/game/level/labels.c
@@ -34,96 +34,6 @@ struct Labels
     enum LabelState *states;
 };
 
-Labels *create_labels_from_line_stream(LineStream *line_stream)
-{
-    trace_assert(line_stream);
-
-    Lt *lt = create_lt();
-
-    Labels * const labels = PUSH_LT(lt, nth_calloc(1, sizeof(Labels)), free);
-    if (labels == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-    labels->lt = lt;
-
-    if (sscanf(
-            line_stream_next(line_stream),
-            "%zu",
-            &labels->count) == EOF) {
-        log_fail("Could not read amount of labels\n");
-        RETURN_LT(lt, NULL);
-    }
-
-    labels->ids = PUSH_LT(lt, nth_calloc(labels->count, sizeof(char) * ENTITY_MAX_ID_SIZE), free);
-    if (labels->ids == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    labels->positions = PUSH_LT(lt, nth_calloc(1, sizeof(Vec2f) * labels->count), free);
-    if (labels->positions == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    labels->colors = PUSH_LT(lt, nth_calloc(1, sizeof(Color) * labels->count), free);
-    if (labels->colors == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    labels->texts = PUSH_LT(lt, nth_calloc(1, sizeof(char*) * labels->count), free);
-    if (labels->texts == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    labels->alphas = PUSH_LT(lt, nth_calloc(1, sizeof(float) * labels->count), free);
-    if (labels->alphas == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    labels->delta_alphas = PUSH_LT(lt, nth_calloc(1, sizeof(float) * labels->count), free);
-    if (labels->delta_alphas == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    labels->states = PUSH_LT(lt, nth_calloc(1, sizeof(enum LabelState) * labels->count), free);
-    if (labels->states == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    char color[7];
-    for (size_t i = 0; i < labels->count; ++i) {
-        if (sscanf(
-                line_stream_next(line_stream),
-                "%" STRINGIFY(ENTITY_MAX_ID_SIZE) "s%f%f%6s\n",
-                labels->ids + i * ENTITY_MAX_ID_SIZE,
-                &labels->positions[i].x,
-                &labels->positions[i].y,
-                color) == EOF) {
-            log_fail("Could not read position and color of %dth label\n", i);
-            RETURN_LT(lt, NULL);
-        }
-
-        labels->colors[i] = hexstr(color);
-
-        const char *label_text = line_stream_next(line_stream);
-        if (label_text == NULL) {
-            log_fail("Could not read text of %dth label\n", i);
-            RETURN_LT(lt, NULL);
-        }
-
-        labels->texts[i] = PUSH_LT(
-            lt,
-            string_duplicate(label_text, NULL),
-            free);
-        if (labels->texts[i] == NULL) {
-            RETURN_LT(lt, NULL);
-        }
-
-        trim_endline(labels->texts[i]);
-    }
-
-    return labels;
-}
-
 Labels *create_labels_from_label_layer(const LabelLayer *label_layer)
 {
     trace_assert(label_layer);

diff --git a/src/game/level/labels.h b/src/game/level/labels.h
index 1bd9d414c3ccd389ae65c349080b67854b339c75..2291bc65d732d6b2cc65ccfb6ee7821f7c33b897 100644 (file)
--- a/src/game/level/labels.h
+++ b/src/game/level/labels.h
@@ -6,10 +6,8 @@
 #include "config.h"
 
 typedef struct Labels Labels;
-typedef struct LineStream LineStream;
 typedef struct LabelLayer LabelLayer;
 
-Labels *create_labels_from_line_stream(LineStream *line_stream);
 Labels *create_labels_from_label_layer(const LabelLayer *label_layer);
 void destroy_labels(Labels *label);
 

diff --git a/src/game/level/lava.c b/src/game/level/lava.c
index 33da8b372cc910541e15b9b878a16e12de6e20df..b6f66515ad393d40cc32708a9aa301ba70b5e611 100644 (file)
--- a/src/game/level/lava.c
+++ b/src/game/level/lava.c
@@ -20,42 +20,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),
-            "%zu",
-            &lava->rects_count) < 0) {
-        log_fail("Could not read amount of lava\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();

diff --git a/src/game/level/lava.h b/src/game/level/lava.h
index bb386d100189e2153fdaf25cc5c88c2e57c3a8ab..cbcbffb1c0af86106e39c14760ffc890136cf480 100644 (file)
--- a/src/game/level/lava.h
+++ b/src/game/level/lava.h
@@ -8,10 +8,8 @@
 #include "math/rect.h"
 
 typedef struct Lava Lava;
-typedef struct LineStream LineStream;
 typedef struct RectLayer RectLayer;
 
-Lava *create_lava_from_line_stream(LineStream *line_stream);
 Lava *create_lava_from_rect_layer(const RectLayer *rect_layer);
 void destroy_lava(Lava *lava);
 

diff --git a/src/game/level/lava/wavy_rect.c b/src/game/level/lava/wavy_rect.c
index 3b47d2faff1cb0e187f57ca9213819510d61aaeb..5c3e14081e13cee1e5917f7ca0e10992be8747b4 100644 (file)
--- a/src/game/level/lava/wavy_rect.c
+++ b/src/game/level/lava/wavy_rect.c
@@ -39,27 +39,6 @@ Wavy_rect *create_wavy_rect(Rect rect, Color color)
     return wavy_rect;
 }
 
-Wavy_rect *create_wavy_rect_from_line_stream(LineStream *line_stream)
-{
-    trace_assert(line_stream);
-    char color_name[7];
-    Rect rect;
-
-    if (sscanf(
-            line_stream_next(line_stream),
-            "%f%f%f%f%6s\n",
-            &rect.x, &rect.y,
-            &rect.w, &rect.h,
-            color_name) < 0) {
-        log_fail("Could not read a wavy rect\n");
-        return NULL;
-    }
-
-    Color color = hexstr(color_name);
-
-    return create_wavy_rect(rect, color);
-}
-
 void destroy_wavy_rect(Wavy_rect *wavy_rect)
 {
     trace_assert(wavy_rect);

diff --git a/src/game/level/lava/wavy_rect.h b/src/game/level/lava/wavy_rect.h
index cc85e7fb272b088360db859c630f34d5b103d7fc..ad3efc45acd50a33b598251f7cee53f2a051c496 100644 (file)
--- a/src/game/level/lava/wavy_rect.h
+++ b/src/game/level/lava/wavy_rect.h
@@ -8,10 +8,8 @@
 #include "math/rect.h"
 
 typedef struct Wavy_rect Wavy_rect;
-typedef struct LineStream LineStream;
 
 Wavy_rect *create_wavy_rect(Rect rect, Color color);
-Wavy_rect *create_wavy_rect_from_line_stream(LineStream *line_stream);
 void destroy_wavy_rect(Wavy_rect *wavy_rect);
 
 int wavy_rect_render(const Wavy_rect *wavy_rect,

diff --git a/src/game/level/platforms.h b/src/game/level/platforms.h
index 2b41e98cd2a4ad500e685c41638bdcdf3ffbb0d8..a3c8cb57b6d43436f4010daa571c7938bc66625b 100644 (file)
--- a/src/game/level/platforms.h
+++ b/src/game/level/platforms.h
@@ -7,7 +7,6 @@
 #include "math/rect.h"
 
 typedef struct Platforms Platforms;
-typedef struct LineStream LineStream;
 typedef struct RectLayer RectLayer;
 
 Platforms *create_platforms_from_rect_layer(const RectLayer *layer);

diff --git a/src/game/level/player.h b/src/game/level/player.h
index c11e3f216dccdee07901b2f20ff01f7b574fc860..1e62323bf483039da922b9e0d894d017ff6717d4 100644 (file)
--- a/src/game/level/player.h
+++ b/src/game/level/player.h
@@ -12,7 +12,6 @@
 
 typedef struct Player Player;
 typedef struct Goals Goals;
-typedef struct LineStream LineStream;
 typedef struct RigidBodies RigidBodies;
 
 Player *create_player_from_player_layer(const PlayerLayer *player_layer,

diff --git a/src/game/level/regions.h b/src/game/level/regions.h
index 793ad819d4b95067d27d9b97a11aadd0ce3add38..8a7bdc203c71d5e22d51ff9972fb030702337412 100644 (file)
--- a/src/game/level/regions.h
+++ b/src/game/level/regions.h
@@ -6,7 +6,6 @@
 
 typedef struct Regions Regions;
 typedef struct Player Player;
-typedef struct LineStream LineStream;
 typedef struct Level Level;
 typedef struct RectLayer RectLayer;
 typedef struct Labels Labels;

diff --git a/src/game/level/rigid_bodies.h b/src/game/level/rigid_bodies.h
index 3edaca6e2903f16dfe74711279727fce3502d0e4..8d18bea8c1a1e823ccc69b8c050510288e5e80d4 100644 (file)
--- a/src/game/level/rigid_bodies.h
+++ b/src/game/level/rigid_bodies.h
@@ -5,7 +5,6 @@
 
 typedef struct RigidBodies RigidBodies;
 typedef struct Platforms Platforms;
-typedef struct LineStream LineStream;
 
 typedef size_t RigidBodyId;