add XY struct for 2d points and offsets

1 files changed, 4 insertions, 3 deletions

diff --git a/Canvas.h b/Canvas.h
index 6f59c15..e25c4b9 100644
--- a/Canvas.h
+++ b/Canvas.h
@@ -5,6 +5,7 @@
 
 #include "CanvasData.h"
 #include "Tile.h"
+#include "XY.h"
 
 #include "TileBehaviorFactory.h"
 #include "TileColorFactory.h"
@@ -18,7 +19,7 @@ public:
 	std::string to_string(bool truecolor = false);
 
 public:
-	virtual Tile & get_tile(unsigned x, unsigned y);
+	virtual Tile & get_tile(const XY &);
 	virtual void set_tile(TileData data);
 
 public:
@@ -36,9 +37,9 @@ private:
 
 private:
 	std::vector<Tile *> tiles;
-	Museum & museum;
+	virtual Tile * & get_tile_unsafe(const XY &);
 
 private:
-	size_t pos_to_index(unsigned x, unsigned y);
+	Museum & museum;
 };