From 93bf93130c860ec4411eb94b164834fbcdcef681 Mon Sep 17 00:00:00 2001 From: rexim Date: Sun, 12 Jan 2020 02:06:58 +0700 Subject: [PATCH] create_rect_layer_from_memory -> create_rect_layer --- src/game/level/level_editor.c | 10 +++++----- src/game/level/level_editor/rect_layer.c | 6 +++--- src/game/level/level_editor/rect_layer.h | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/game/level/level_editor.c b/src/game/level/level_editor.c index f69d6adc..48457880 100644 --- a/src/game/level/level_editor.c +++ b/src/game/level/level_editor.c @@ -43,11 +43,11 @@ LevelEditor *create_level_editor_from_memory(Memory *memory, Cursor *cursor) level_editor->background_layer = create_background_layer(hexstr("fffda5")); level_editor->player_layer = create_player_layer(vec(0.0f, 0.0f), hexstr("ff8080")); - level_editor->platforms_layer = create_rect_layer_from_memory(memory, "platform", cursor); - level_editor->lava_layer = create_rect_layer_from_memory(memory, "lava", cursor); - level_editor->back_platforms_layer = create_rect_layer_from_memory(memory, "back_platform", cursor); - level_editor->boxes_layer = create_rect_layer_from_memory(memory, "box", cursor); - level_editor->regions_layer = create_rect_layer_from_memory(memory, "region", cursor); + level_editor->platforms_layer = create_rect_layer(memory, "platform", cursor); + level_editor->lava_layer = create_rect_layer(memory, "lava", cursor); + level_editor->back_platforms_layer = create_rect_layer(memory, "back_platform", cursor); + level_editor->boxes_layer = create_rect_layer(memory, "box", cursor); + level_editor->regions_layer = create_rect_layer(memory, "region", cursor); level_editor->goals_layer = create_point_layer_from_memory(memory, "goal"); level_editor->label_layer = create_label_layer_from_memory(memory, "label"); diff --git a/src/game/level/level_editor/rect_layer.c b/src/game/level/level_editor/rect_layer.c index 5f3975d0..74d5500b 100644 --- a/src/game/level/level_editor/rect_layer.c +++ b/src/game/level/level_editor/rect_layer.c @@ -796,9 +796,9 @@ LayerPtr rect_layer_as_layer(RectLayer *rect_layer) return layer; } -RectLayer *create_rect_layer_from_memory(Memory *memory, - const char *id_name_prefix, - Cursor *cursor) +RectLayer *create_rect_layer(Memory *memory, + const char *id_name_prefix, + Cursor *cursor) { trace_assert(memory); trace_assert(id_name_prefix); diff --git a/src/game/level/level_editor/rect_layer.h b/src/game/level/level_editor/rect_layer.h index 73d95fdb..77013ab3 100644 --- a/src/game/level/level_editor/rect_layer.h +++ b/src/game/level/level_editor/rect_layer.h @@ -46,9 +46,9 @@ LayerPtr rect_layer_as_layer(RectLayer *layer); // NOTE: create_rect_layer and create_rect_layer_from_line_stream does // not own id_name_prefix -RectLayer *create_rect_layer_from_memory(Memory *memory, - const char *id_name_prefix, - Cursor *cursor); +RectLayer *create_rect_layer(Memory *memory, + const char *id_name_prefix, + Cursor *cursor); void rect_layer_load(RectLayer *rect_layer, Memory *memory, String *input); static inline -- 2.44.0