From 29f818c314f86f9a842840c20d9634f0711507a6 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Mon, 16 Mar 2015 21:28:46 -0400 Subject: Added tool to map editor to set game starting position --- tools/mapedit/src/frame.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tools/mapedit/src/frame.h') 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 { MapeditFrame(std::unique_ptr world); MapeditWidget* GetMapEditor(); - void StartAddingEntity(); - void FinishAddingEntity(); + void SetIsAddingEntity(bool isAddingEntity); void MapDirtyDidChange(bool dirty); + void SetIsSettingStart(bool isSettingStart); static void NewWorld(); static bool OpenWorld(std::string filename); @@ -42,6 +42,7 @@ class MapeditFrame : public wxFrame { void populateMapTree(wxTreeItemId node, std::list> maps); void SelectMap(Map* map); wxTreeItemId MoveTreeNode(wxTreeItemId toCopy, wxTreeItemId newParent); + void SetStartposLabel(); void ZoomIn(wxCommandEvent& event); void ZoomOut(wxCommandEvent& event); @@ -63,6 +64,8 @@ class MapeditFrame : public wxFrame { void OnWillDragMap(wxTreeEvent& event); void OnDidDragMap(wxTreeEvent& event); void OnRightClickTree(wxTreeEvent& event); + void OnSetStartpos(wxCommandEvent& event); + void OnCancelSetStartpos(wxCommandEvent& event); std::unique_ptr world; Map* currentMap; @@ -79,6 +82,9 @@ class MapeditFrame : public wxFrame { wxTreeCtrl* mapTree; wxTreeItemId dragMap; wxMenu* mapTreePopup; + wxStaticText* startposLabel; + wxButton* setStartposButton; + wxButton* cancelStartposButton; bool addingEntity = false; -- cgit 1.4.1