]> git.lizzy.rs Git - nothing.git/commitdiff
create_rect_layer_from_memory -> create_rect_layer
authorrexim <reximkut@gmail.com>
Sat, 11 Jan 2020 19:06:58 +0000 (02:06 +0700)
committerrexim <reximkut@gmail.com>
Sat, 11 Jan 2020 19:06:58 +0000 (02:06 +0700)
src/game/level/level_editor.c
src/game/level/level_editor/rect_layer.c
src/game/level/level_editor/rect_layer.h

index f69d6adcff704b4352803f3b4c5393b5738364f6..48457880b9cd7534c37e12feea386a658b391350 100644 (file)
@@ -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");
 
index 5f3975d09c28a1cecc890eb22b12e08963bd1f97..74d5500bcd821d8be465f361451f5a172e339414 100644 (file)
@@ -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);
index 73d95fdb6969b51c3f1039c9ced631f50ff25d4d..77013ab3bf3b329b97b99603a8855aed86ea06ed 100644 (file)
@@ -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