From 1dd31e1505524f15ad9abcd2aa9e4aef1d7e2ec7 Mon Sep 17 00:00:00 2001 From: rexim Date: Sun, 12 Jan 2020 02:10:00 +0700 Subject: [PATCH] Remove *_from_memory --- src/game.c | 6 +++--- src/game/level/level_editor.c | 12 ++++++------ src/game/level/level_editor.h | 4 ++-- src/game/level/level_editor/label_layer.c | 4 ++-- src/game/level/level_editor/label_layer.h | 3 +-- src/game/level/level_editor/point_layer.c | 4 ++-- src/game/level/level_editor/point_layer.h | 3 +-- src/game/level/level_editor/undo_history.c | 2 +- src/game/level/level_editor/undo_history.h | 2 +- 9 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/game.c b/src/game.c index c8615c72..2811c515 100644 --- a/src/game.c +++ b/src/game.c @@ -109,7 +109,7 @@ Game *create_game(const char *level_folder, } } - game->level_editor = create_level_editor_from_memory( + game->level_editor = create_level_editor( &game->level_editor_memory, &game->cursor); @@ -326,7 +326,7 @@ static int game_event_level_picker(Game *game, const SDL_Event *event) switch(event->key.keysym.sym) { case SDLK_n: { memory_clean(&game->level_editor_memory); - game->level_editor = create_level_editor_from_memory( + game->level_editor = create_level_editor( &game->level_editor_memory, &game->cursor); @@ -533,7 +533,7 @@ int game_load_level(Game *game, const char *level_filename) memory_clean(&game->level_editor_memory); game->level_editor = - create_level_editor_from_file_with_memory( + create_level_editor_from_file( &game->level_editor_memory, &game->cursor, level_filename); diff --git a/src/game/level/level_editor.c b/src/game/level/level_editor.c index 48457880..24c44f1e 100644 --- a/src/game/level/level_editor.c +++ b/src/game/level/level_editor.c @@ -32,7 +32,7 @@ static int level_editor_dump(LevelEditor *level_editor); // TODO(#994): too much duplicate code between create_level_editor and create_level_editor_from_file -LevelEditor *create_level_editor_from_memory(Memory *memory, Cursor *cursor) +LevelEditor *create_level_editor(Memory *memory, Cursor *cursor) { LevelEditor *level_editor = memory_alloc(memory, sizeof(LevelEditor)); memset(level_editor, 0, sizeof(*level_editor)); @@ -48,8 +48,8 @@ LevelEditor *create_level_editor_from_memory(Memory *memory, Cursor *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"); + level_editor->goals_layer = create_point_layer(memory, "goal"); + level_editor->label_layer = create_label_layer(memory, "label"); level_editor->layers[LAYER_PICKER_BOXES] = rect_layer_as_layer(level_editor->boxes_layer); level_editor->layers[LAYER_PICKER_PLATFORMS] = rect_layer_as_layer(level_editor->platforms_layer); @@ -72,18 +72,18 @@ LevelEditor *create_level_editor_from_memory(Memory *memory, Cursor *cursor) }; level_editor->camera_scale = 1.0f; - level_editor->undo_history = create_undo_history_from_memory(memory); + level_editor->undo_history = create_undo_history(memory); return level_editor; } -LevelEditor *create_level_editor_from_file_with_memory(Memory *memory, Cursor *cursor, const char *file_name) +LevelEditor *create_level_editor_from_file(Memory *memory, Cursor *cursor, const char *file_name) { trace_assert(memory); trace_assert(cursor); trace_assert(file_name); - LevelEditor *level_editor = create_level_editor_from_memory(memory, cursor); + LevelEditor *level_editor = create_level_editor(memory, cursor); level_editor->file_name = strdup_to_memory(memory, file_name); String input = read_whole_file(memory, file_name); diff --git a/src/game/level/level_editor.h b/src/game/level/level_editor.h index 07f36d56..afa2494d 100644 --- a/src/game/level/level_editor.h +++ b/src/game/level/level_editor.h @@ -49,8 +49,8 @@ struct LevelEditor char *file_name; }; -LevelEditor *create_level_editor_from_memory(Memory *memory, Cursor *cursor); -LevelEditor *create_level_editor_from_file_with_memory(Memory *memory, Cursor *cursor, const char *file_name); +LevelEditor *create_level_editor(Memory *memory, Cursor *cursor); +LevelEditor *create_level_editor_from_file(Memory *memory, Cursor *cursor, const char *file_name); int level_editor_render(const LevelEditor *level_editor, const Camera *camera); diff --git a/src/game/level/level_editor/label_layer.c b/src/game/level/level_editor/label_layer.c index dff29843..8d2998a7 100644 --- a/src/game/level/level_editor/label_layer.c +++ b/src/game/level/level_editor/label_layer.c @@ -141,8 +141,8 @@ LayerPtr label_layer_as_layer(LabelLayer *label_layer) return layer; } -LabelLayer *create_label_layer_from_memory(Memory *memory, - const char *id_name_prefix) +LabelLayer *create_label_layer(Memory *memory, + const char *id_name_prefix) { trace_assert(memory); trace_assert(id_name_prefix); diff --git a/src/game/level/level_editor/label_layer.h b/src/game/level/level_editor/label_layer.h index ee91f0a1..6b175dac 100644 --- a/src/game/level/level_editor/label_layer.h +++ b/src/game/level/level_editor/label_layer.h @@ -40,8 +40,7 @@ LayerPtr label_layer_as_layer(LabelLayer *label_layer); // NOTE: create_label_layer and create_label_layer_from_line_stream do // not own id_name_prefix -LabelLayer create_label_layer(const char *id_name_prefix); -LabelLayer *create_label_layer_from_memory(Memory *memory, const char *id_name_prefix); +LabelLayer *create_label_layer(Memory *memory, const char *id_name_prefix); void label_layer_load(LabelLayer *label_layer, Memory *memory, String *input); diff --git a/src/game/level/level_editor/point_layer.c b/src/game/level/level_editor/point_layer.c index f9f8a54d..41155509 100644 --- a/src/game/level/level_editor/point_layer.c +++ b/src/game/level/level_editor/point_layer.c @@ -139,8 +139,8 @@ LayerPtr point_layer_as_layer(PointLayer *point_layer) return layer; } -PointLayer *create_point_layer_from_memory(Memory *memory, - const char *id_name_prefix) +PointLayer *create_point_layer(Memory *memory, + const char *id_name_prefix) { trace_assert(memory); trace_assert(id_name_prefix); diff --git a/src/game/level/level_editor/point_layer.h b/src/game/level/level_editor/point_layer.h index 1869a9f2..ae6b9d6e 100644 --- a/src/game/level/level_editor/point_layer.h +++ b/src/game/level/level_editor/point_layer.h @@ -37,8 +37,7 @@ typedef struct { LayerPtr point_layer_as_layer(PointLayer *point_layer); // NOTE: create_point_layer and create_point_layer_from_line_stream do // not own id_name_prefix -PointLayer create_point_layer(const char *id_name_prefix); -PointLayer *create_point_layer_from_memory(Memory *memory, const char *id_name_prefix); +PointLayer *create_point_layer(Memory *memory, const char *id_name_prefix); void point_layer_load(PointLayer *point_layer, Memory *memory, String *input); diff --git a/src/game/level/level_editor/undo_history.c b/src/game/level/level_editor/undo_history.c index f1e933ff..2a7745de 100644 --- a/src/game/level/level_editor/undo_history.c +++ b/src/game/level/level_editor/undo_history.c @@ -14,7 +14,7 @@ typedef struct { size_t context_data_size; } HistoryItem; -UndoHistory *create_undo_history_from_memory(Memory *memory) +UndoHistory *create_undo_history(Memory *memory) { UndoHistory *result = memory_alloc(memory, sizeof(UndoHistory)); result->actions = create_ring_buffer_from_buffer( diff --git a/src/game/level/level_editor/undo_history.h b/src/game/level/level_editor/undo_history.h index 3a63fd30..1c3cd43d 100644 --- a/src/game/level/level_editor/undo_history.h +++ b/src/game/level/level_editor/undo_history.h @@ -10,7 +10,7 @@ typedef struct { Memory *memory; } UndoHistory; -UndoHistory *create_undo_history_from_memory(Memory *memory); +UndoHistory *create_undo_history(Memory *memory); void undo_history_push(UndoHistory *undo_history, RevertAction revert, -- 2.44.0