Remove Lt from PointLayer

[nothing.git] / src / game / level / level_editor.h

diff --git a/src/game/level/level_editor.h b/src/game/level/level_editor.h
index 717e05c209819452aef3b98572f6fa06eb3d7a4f..b56c5f969e7947e7bb06d636e3a7061bd4a41d27 100644 (file)
--- a/src/game/level/level_editor.h
+++ b/src/game/level/level_editor.h
@@ -4,17 +4,14 @@
 #include "game/level/level_editor/layer.h"
 #include "game/level/level_editor/layer_picker.h"
 #include "game/level/level_editor/undo_history.h"
-#include "game/level/level_editor/action_picker.h"
+#include "game/level/level_editor/rect_layer.h"
+#include "game/level/level_editor/point_layer.h"
 #include "ui/wiggly_text.h"
+#include "ui/cursor.h"
 
-typedef struct LevelMetadata LevelMetadata;
 typedef struct LevelEditor LevelEditor;
-typedef struct RectLayer RectLayer;
-typedef struct PointLayer PointLayer;
 typedef struct LabelLayer LabelLayer;
-typedef struct Edit_field Edit_field;
 typedef struct Sound_samples Sound_samples;
-typedef struct Game Game;
 
 typedef enum {
     LEVEL_EDITOR_IDLE = 0,
@@ -27,18 +24,17 @@ struct LevelEditor
     LevelEditorState state;
     Vec2f camera_position;
     float camera_scale;
-    Edit_field *edit_field_filename;
+    Edit_field edit_field_filename;
     LayerPicker layer_picker;
     FadingWigglyText notice;
 
-    LevelMetadata *metadata;
-    RectLayer *boxes_layer;
-    RectLayer *platforms_layer;
-    RectLayer *back_platforms_layer;
-    PointLayer *goals_layer;
+    RectLayer boxes_layer;
+    RectLayer platforms_layer;
+    RectLayer back_platforms_layer;
+    PointLayer goals_layer;
     PlayerLayer player_layer;
-    RectLayer *lava_layer;
-    RectLayer *regions_layer;
+    RectLayer lava_layer;
+    RectLayer regions_layer;
     BackgroundLayer background_layer;
     LabelLayer *label_layer;
 
@@ -54,16 +50,15 @@ struct LevelEditor
     const char *file_name;
 };
 
-LevelEditor *create_level_editor(void);
-LevelEditor *create_level_editor_from_file(const char *file_name);
+LevelEditor *create_level_editor(Cursor *cursor);
+LevelEditor *create_level_editor_from_file(const char *file_name, Cursor *cursor);
 void destroy_level_editor(LevelEditor *level_editor);
 
 int level_editor_render(const LevelEditor *level_editor,
                         const Camera *camera);
 int level_editor_event(LevelEditor *level_editor,
                        const SDL_Event *event,
-                       Camera *camera,
-                       Game *game);
+                       Camera *camera);
 int level_editor_focus_camera(LevelEditor *level_editor,
                               Camera *camera);
 int level_editor_update(LevelEditor *level_editor, float delta_time);