EliasFleckenstein03
/
nothing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove *_from_memory

master
rexim 2020-01-12 02:10:00 +07:00
parent 93bf93130c
commit 1dd31e1505
9 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/game.c
View File

@ -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);

12
src/game/level/level_editor.c
View File

@ -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);

4
src/game/level/level_editor.h
View File

@ -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);

4
src/game/level/level_editor/label_layer.c
View File

@ -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);

3
src/game/level/level_editor/label_layer.h
View File

@ -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);

4
src/game/level/level_editor/point_layer.c
View File

@ -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);

3
src/game/level/level_editor/point_layer.h
View File

@ -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);

2
src/game/level/level_editor/undo_history.c
View File

@ -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(

2
src/game/level/level_editor/undo_history.h
View File

@ -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,