diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-16 21:28:46 -0400 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-16 21:28:46 -0400 |
commit | 29f818c314f86f9a842840c20d9634f0711507a6 (patch) | |
tree | 46f6445f336cc2b7c5dfc64b6f99459a97a8bc03 /tools/mapedit/src/frame.h | |
parent | 8b61d93fc869ea39a78cdc134002ef11bf3e69d3 (diff) | |
download | therapy-29f818c314f86f9a842840c20d9634f0711507a6.tar.gz therapy-29f818c314f86f9a842840c20d9634f0711507a6.tar.bz2 therapy-29f818c314f86f9a842840c20d9634f0711507a6.zip |
Added tool to map editor to set game starting position
Diffstat (limited to 'tools/mapedit/src/frame.h')
-rw-r--r-- | tools/mapedit/src/frame.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/mapedit/src/frame.h b/tools/mapedit/src/frame.h index 6085eb2..067c848 100644 --- a/tools/mapedit/src/frame.h +++ b/tools/mapedit/src/frame.h | |||
@@ -28,9 +28,9 @@ class MapeditFrame : public wxFrame { | |||
28 | MapeditFrame(std::unique_ptr<World> world); | 28 | MapeditFrame(std::unique_ptr<World> world); |
29 | 29 | ||
30 | MapeditWidget* GetMapEditor(); | 30 | MapeditWidget* GetMapEditor(); |
31 | void StartAddingEntity(); | 31 | void SetIsAddingEntity(bool isAddingEntity); |
32 | void FinishAddingEntity(); | ||
33 | void MapDirtyDidChange(bool dirty); | 32 | void MapDirtyDidChange(bool dirty); |
33 | void SetIsSettingStart(bool isSettingStart); | ||
34 | 34 | ||
35 | static void NewWorld(); | 35 | static void NewWorld(); |
36 | static bool OpenWorld(std::string filename); | 36 | static bool OpenWorld(std::string filename); |
@@ -42,6 +42,7 @@ class MapeditFrame : public wxFrame { | |||
42 | void populateMapTree(wxTreeItemId node, std::list<std::shared_ptr<Map>> maps); | 42 | void populateMapTree(wxTreeItemId node, std::list<std::shared_ptr<Map>> maps); |
43 | void SelectMap(Map* map); | 43 | void SelectMap(Map* map); |
44 | wxTreeItemId MoveTreeNode(wxTreeItemId toCopy, wxTreeItemId newParent); | 44 | wxTreeItemId MoveTreeNode(wxTreeItemId toCopy, wxTreeItemId newParent); |
45 | void SetStartposLabel(); | ||
45 | 46 | ||
46 | void ZoomIn(wxCommandEvent& event); | 47 | void ZoomIn(wxCommandEvent& event); |
47 | void ZoomOut(wxCommandEvent& event); | 48 | void ZoomOut(wxCommandEvent& event); |
@@ -63,6 +64,8 @@ class MapeditFrame : public wxFrame { | |||
63 | void OnWillDragMap(wxTreeEvent& event); | 64 | void OnWillDragMap(wxTreeEvent& event); |
64 | void OnDidDragMap(wxTreeEvent& event); | 65 | void OnDidDragMap(wxTreeEvent& event); |
65 | void OnRightClickTree(wxTreeEvent& event); | 66 | void OnRightClickTree(wxTreeEvent& event); |
67 | void OnSetStartpos(wxCommandEvent& event); | ||
68 | void OnCancelSetStartpos(wxCommandEvent& event); | ||
66 | 69 | ||
67 | std::unique_ptr<World> world; | 70 | std::unique_ptr<World> world; |
68 | Map* currentMap; | 71 | Map* currentMap; |
@@ -79,6 +82,9 @@ class MapeditFrame : public wxFrame { | |||
79 | wxTreeCtrl* mapTree; | 82 | wxTreeCtrl* mapTree; |
80 | wxTreeItemId dragMap; | 83 | wxTreeItemId dragMap; |
81 | wxMenu* mapTreePopup; | 84 | wxMenu* mapTreePopup; |
85 | wxStaticText* startposLabel; | ||
86 | wxButton* setStartposButton; | ||
87 | wxButton* cancelStartposButton; | ||
82 | 88 | ||
83 | bool addingEntity = false; | 89 | bool addingEntity = false; |
84 | 90 | ||