5 files changed, 204 insertions, 16 deletions

@@ -6,18 +6,31 @@
 
 enum {
   MENU_VIEW_ZOOM_IN,
-  MENU_VIEW_ZOOM_OUT
+  MENU_VIEW_ZOOM_OUT,
+  MENU_FILE_NEW,
+  MENU_FILE_OPEN,
+  MENU_FILE_SAVE,
+  MENU_FILE_CLOSE
 };
 
 wxBEGIN_EVENT_TABLE(MapeditFrame, wxFrame)
-  EVT_MENU(wxID_EXIT, MapeditFrame::OnExit)
+  EVT_MENU(wxID_EXIT, MapeditFrame::OnQuit)
   EVT_MENU(MENU_VIEW_ZOOM_IN, MapeditFrame::ZoomIn)
   EVT_MENU(MENU_VIEW_ZOOM_OUT, MapeditFrame::ZoomOut)
+  EVT_MENU(MENU_FILE_NEW, MapeditFrame::OnNew)
+  EVT_MENU(MENU_FILE_OPEN, MapeditFrame::OnOpen)
+  EVT_MENU(MENU_FILE_SAVE, MapeditFrame::OnSave)
+  EVT_MENU(MENU_FILE_CLOSE, MapeditFrame::OnClose)
+  EVT_CLOSE(MapeditFrame::OnExit)
 wxEND_EVENT_TABLE()
 
-MapeditFrame::MapeditFrame(Map map) : wxFrame(NULL, wxID_ANY, "Map Editor", wxPoint(50, 50), wxSize(GAME_WIDTH*3, GAME_HEIGHT*2)), map(map)
+MapeditFrame::MapeditFrame(Map map, std::string filename) : wxFrame(NULL, wxID_ANY, "Map Editor", wxDefaultPosition, wxSize(GAME_WIDTH*3, GAME_HEIGHT*2)), map(map), filename(filename)
 {
   wxMenu* menuFile = new wxMenu;
+  menuFile->Append(MENU_FILE_NEW, "New\tCtrl-N");
+  menuFile->Append(MENU_FILE_OPEN, "Open\tCtrl-O");
+  menuFile->Append(MENU_FILE_SAVE, "Save\tCtrl-S");
+  menuFile->Append(MENU_FILE_CLOSE, "Close\tCtrl-W");
   menuFile->Append(wxID_EXIT);
   
   wxMenu* menuView = new wxMenu;
@@ -54,9 +67,34 @@ MapeditFrame::MapeditFrame(Map map) : wxFrame(NULL, wxID_ANY, "Map Editor", wxPo
   sizermain->SetSizeHints(this);
 }
 
-void MapeditFrame::OnExit(wxCommandEvent& event)
+void MapeditFrame::OnExit(wxCloseEvent& event)
 {
-  Close(true);
+  if (event.CanVeto() && map.hasUnsavedChanges())
+  {
+    switch (wxMessageBox("Current map has unsaved changes. Save before closing?", "Please confirm", wxICON_QUESTION|wxYES_NO|wxCANCEL, this))
+    {
+      case wxYES:
+        if (filename == "")
+        {
+          wxFileDialog saveFileDialog(this, "Save map", "", "", "XML files (*.xml)|*.xml", wxFD_SAVE);
+          if (saveFileDialog.ShowModal() == wxID_CANCEL)
+          {
+            return;
+          }
+    
+          filename = saveFileDialog.GetPath().ToStdString();
+        }
+  
+        map.save(filename);
+        break;
+        
+      case wxCANCEL:
+        event.Veto(true);
+        return;
+    }
+  }
+  
+  event.Skip();
 }
 
 MapeditWidget* MapeditFrame::GetMapEditor()
@@ -73,3 +111,48 @@ void MapeditFrame::ZoomOut(wxCommandEvent& event)
 {
   mapEditor->ZoomOut();
 }
+
+void MapeditFrame::OnNew(wxCommandEvent& event)
+{
+  MapeditFrame* frame = new MapeditFrame();
+  frame->Show(true);
+}
+
+void MapeditFrame::OnOpen(wxCommandEvent& event)
+{
+  wxFileDialog openFileDialog(this, "Open map", "", "", "XML files (*.xml)|*.xml", wxFD_OPEN|wxFD_FILE_MUST_EXIST);
+  if (openFileDialog.ShowModal() == wxID_CANCEL)
+  {
+    return;
+  }
+  
+  std::string filename = openFileDialog.GetPath().ToStdString();
+  MapeditFrame* frame = new MapeditFrame(Map(filename), filename);
+  frame->Show(true);
+}
+
+void MapeditFrame::OnSave(wxCommandEvent& event)
+{
+  if (filename == "")
+  {
+    wxFileDialog saveFileDialog(this, "Save map", "", "", "XML files (*.xml)|*.xml", wxFD_SAVE);
+    if (saveFileDialog.ShowModal() == wxID_CANCEL)
+    {
+      return;
+    }
+    
+    filename = saveFileDialog.GetPath().ToStdString();
+  }
+  
+  map.save(filename);
+}
+
+void MapeditFrame::OnClose(wxCommandEvent& event)
+{
+  Close(false);
+}
+
+void MapeditFrame::OnQuit(wxCommandEvent& event)
+{
+  // TODO
+}
@@ -13,21 +13,25 @@
 
 class MapeditFrame : public wxFrame {
   public:
-    MapeditFrame() : MapeditFrame(Map()) {}
-    MapeditFrame(Map map);
+    MapeditFrame() : MapeditFrame(Map(), "") {}
+    MapeditFrame(Map map, std::string filename);
     
     MapeditWidget* GetMapEditor();
 
-  protected:
+  private:
     void ZoomIn(wxCommandEvent& event);
     void ZoomOut(wxCommandEvent& event);
-    
-  private:
-    void OnExit(wxCommandEvent& event);
+    void OnNew(wxCommandEvent& event);
+    void OnOpen(wxCommandEvent& event);
+    void OnSave(wxCommandEvent& event);
+    void OnClose(wxCommandEvent& event);
+    void OnExit(wxCloseEvent& event);
+    void OnQuit(wxCommandEvent& event);
     
     Map map;
     MapeditWidget* mapEditor;
     TileWidget* tileEditor;
+    std::string filename;
     
     wxDECLARE_EVENT_TABLE();
 };
@@ -1,12 +1,15 @@
 #include "map.h"
 #include <libxml/parser.h>
+#include <libxml/xmlwriter.h>
+#include <sstream>
 
 Map::Map()
 {
   mapdata = (int*) calloc(MAP_WIDTH * MAP_HEIGHT, sizeof(int));
+  dirty = true;
 }
 
-Map::Map(const std::string filename)
+Map::Map(std::string filename)
 {
   xmlDocPtr doc = xmlParseFile(filename.c_str());
   if (doc == nullptr)
@@ -56,6 +59,8 @@ Map::Map(const std::string filename)
   }
   
   xmlFreeDoc(doc);
+  
+  dirty = false;
 }
 
 Map::Map(const Map& map)
@@ -66,6 +71,7 @@ Map::Map(const Map& map)
   title = map.title;
   leftmap = map.leftmap;
   rightmap = map.rightmap;
+  dirty = map.dirty;
 }
 
 Map::Map(Map&& map) : Map()
@@ -91,4 +97,78 @@ void swap(Map& first, Map& second)
   std::swap(first.title, second.title);
   std::swap(first.leftmap, second.leftmap);
   std::swap(first.rightmap, second.rightmap);
-}
\ No newline at end of file
+  std::swap(first.dirty, second.dirty);
+}
+
+#define MY_ENCODING "ISO-8859-1"
+
+void Map::save(std::string name)
+{
+  if (!dirty) return;
+  
+  int rc;
+  
+  xmlTextWriterPtr writer = xmlNewTextWriterFilename(name.c_str(), 0);
+  if (writer == NULL) throw MapWriteException(name);
+
+  rc = xmlTextWriterStartDocument(writer, NULL, MY_ENCODING, NULL);
+  if (rc < 0) throw MapWriteException(name);
+  
+  rc = xmlTextWriterStartElement(writer, (xmlChar*) "map-def");
+  if (rc < 0) throw MapWriteException(name);
+  
+  rc = xmlTextWriterWriteElement(writer, (xmlChar*) "name", (xmlChar*) title.c_str());
+  if (rc < 0) throw MapWriteException(name);
+  
+  std::ostringstream mapdata_out;
+  for (int y=0; y<MAP_HEIGHT; y++)
+  {
+    for (int x=0; x<MAP_WIDTH; x++)
+    {
+      mapdata_out << mapdata[x+y*MAP_WIDTH] << ",";
+    }
+    
+    mapdata_out << std::endl;
+  }
+  
+  rc = xmlTextWriterWriteElement(writer, (xmlChar*) "environment", (xmlChar*) mapdata_out.str().c_str());
+  if (rc < 0) throw MapWriteException(name);
+  
+  if (leftmap != "")
+  {
+    rc = xmlTextWriterWriteElement(writer, (xmlChar*) "leftmap", (xmlChar*) leftmap.c_str());
+    if (rc < 0) throw MapWriteException(name);
+  }
+  
+  if (rightmap != "")
+  {
+    rc = xmlTextWriterWriteElement(writer, (xmlChar*) "rightmap", (xmlChar*) rightmap.c_str());
+    if (rc < 0) throw MapWriteException(name);
+  }
+  
+  rc = xmlTextWriterEndElement(writer);
+  if (rc < 0) throw MapWriteException(name);
+  
+  rc = xmlTextWriterEndDocument(writer);
+  if (rc < 0) throw MapWriteException(name);
+  
+  xmlFreeTextWriter(writer);
+  
+  dirty = false;
+}
+
+bool Map::hasUnsavedChanges() const
+{
+  return dirty;
+}
+
+void Map::setTileAt(int x, int y, int tile)
+{
+  dirty = true;
+  mapdata[x+y*MAP_WIDTH] = tile;
+}
+
+int Map::getTileAt(int x, int y) const
+{
+  return mapdata[x+y*MAP_WIDTH];
+}
@@ -25,20 +25,41 @@ class MapLoadException: public std::exception
     std::string mapname;
 };
 
+class MapWriteException: public std::exception
+{
+  public:
+    MapWriteException(std::string mapname) : mapname(mapname) {}
+    
+    virtual const char* what() const throw()
+    {
+      return ("An error occured writing map " + mapname).c_str();
+    }
+    
+  private:
+    std::string mapname;
+};
+
 class Map {
   public:
     Map();
-    Map(const std::string name);
+    Map(std::string name);
     Map(const Map& map);
     Map(Map&& map);
     ~Map();
     Map& operator= (Map other);
     friend void swap(Map& first, Map& second);
     
+    void save(std::string name);
+    bool hasUnsavedChanges() const;
+    void setTileAt(int x, int y, int tile);
+    int getTileAt(int x, int y) const;
+    
+  private:
     int* mapdata;
     std::string title;
     std::string leftmap;
     std::string rightmap;
+    bool dirty;
 };
 
 #endif
@@ -48,7 +48,7 @@ void MapeditWidget::OnPaint(wxPaintEvent& event)
   {
     for (int x=0; x<MAP_WIDTH; x++)
     {
-      int tile = map->mapdata[x+y*MAP_WIDTH];
+      int tile = map->getTileAt(x, y);
       dc.StretchBlit(x*TILE_WIDTH*scale-vX, y*TILE_HEIGHT*scale-vY, TILE_WIDTH*scale, TILE_HEIGHT*scale, &tiles_dc, tile%8*TILE_WIDTH, tile/8*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT);
     }
   }
@@ -76,7 +76,7 @@ void MapeditWidget::SetTile(wxPoint pos)
   int x = (pos.x + vX) / (TILE_WIDTH * scale);
   int y = (pos.y + vY) / (TILE_HEIGHT * scale);
   
-  map->mapdata[x+y*MAP_WIDTH] = tileWidget->getSelected();
+  map->setTileAt(x, y, tileWidget->getSelected());
   Refresh();
 }