From 7f0e8c7ef70c62814c274f110367db92f01cbb26 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Tue, 10 Mar 2015 00:41:59 -0400
Subject: C++11'd everything!

Also moved location information from physics components into entity.
---
 src/map.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/map.h')

diff --git a/src/map.h b/src/map.h
index d7b4ecf..e3d1802 100644
--- a/src/map.h
+++ b/src/map.h
@@ -3,9 +3,13 @@
 
 class Map {
   public:
-    Map();
-    Map(char* filename);
+    Map(const char* filename);
+    Map(Map& map);
+    Map(Map&& map);
     ~Map();
+    Map& operator= (Map other);
+    friend void swap(Map& first, Map& second);
+    
     const int* mapdata();
     const char* title();
     Map* getLeftMap();
@@ -13,10 +17,12 @@ class Map {
     void setLeftMap(Map* m);
     void setRightMap(Map* m);
   private:
+    Map();
+    
     int* m_mapdata;
     char* m_title;
-    Map* m_leftMap = 0;
-    Map* m_rightMap = 0;
+    Map* m_leftMap;
+    Map* m_rightMap;
 };
 
 #endif
-- 
cgit 1.4.1