From 213cab3c04b81428ab715f340bd7c12438fdb980 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 15 Mar 2015 23:24:22 -0400 Subject: Map editor can now add entities to maps Also fixed a big bug regarding scrolling --- tools/mapedit/src/widget.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'tools/mapedit/src/widget.h') diff --git a/tools/mapedit/src/widget.h b/tools/mapedit/src/widget.h index c8bfb57..9de5b02 100644 --- a/tools/mapedit/src/widget.h +++ b/tools/mapedit/src/widget.h @@ -10,6 +10,13 @@ #include "map.h" #include "tile_widget.h" +class MapeditFrame; + +enum EditMode { + EditTiles, + EditEntities +}; + class MapeditWidget : public wxScrolledWindow { public: MapeditWidget(); @@ -17,6 +24,11 @@ class MapeditWidget : public wxScrolledWindow { void ZoomIn(); void ZoomOut(); + void SetEditMode(EditMode editMode); + void StartAddingEntity(MapObject* object); + void CancelAddingEntity(); + + MapeditFrame* frame; protected: void Init(); @@ -38,9 +50,12 @@ class MapeditWidget : public wxScrolledWindow { int scale; wxPoint mousePos; bool mouseIsIn = false; + EditMode editMode = EditTiles; + + MapObject* addingEntity = nullptr; - DECLARE_DYNAMIC_CLASS(MapeditWidget); - DECLARE_EVENT_TABLE(); + DECLARE_DYNAMIC_CLASS(MapeditWidget) + DECLARE_EVENT_TABLE() }; #endif -- cgit 1.4.1