From 124116a8bf56ccc742e6efcb3b9e83abe97bf143 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 26 Sep 2014 03:13:26 +0200
Subject: Extend map model with rotated tiles

---
 src/view/MapView.cpp | 4 ++--
 src/view/MapView.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/view')

diff --git a/src/view/MapView.cpp b/src/view/MapView.cpp
index c1c0639..20d5af5 100644
--- a/src/view/MapView.cpp
+++ b/src/view/MapView.cpp
@@ -31,7 +31,7 @@ namespace RPGEdit {
 
 namespace View {
 
-MapView::MapView(const std::shared_ptr<Window> &window0, const std::vector<std::string> &tileset)
+MapView::MapView(const std::shared_ptr<Window> &window0, const std::vector<std::pair<std::string, int>> &tileset)
 	: window(window0) {
 	uint32_t rmask, gmask, bmask, amask;
 
@@ -59,7 +59,7 @@ MapView::MapView(const std::shared_ptr<Window> &window0, const std::vector<std::
 			.h = 0,
 		};
 
-		SDL_Surface *sprite = spriteCache->get("tile", tileset[i], 0);
+		SDL_Surface *sprite = spriteCache->get("tile", tileset[i].first, tileset[i].second);
 
 		SDL_SetSurfaceBlendMode(sprite, SDL_BLENDMODE_NONE);
 		SDL_BlitSurface(sprite, nullptr, surface, &rect);
diff --git a/src/view/MapView.hpp b/src/view/MapView.hpp
index 9a27328..c5867cc 100644
--- a/src/view/MapView.hpp
+++ b/src/view/MapView.hpp
@@ -50,7 +50,7 @@ private:
 	}
 
 public:
-	MapView(const std::shared_ptr<Window> &window0, const std::vector<std::string> &tileset);
+	MapView(const std::shared_ptr<Window> &window0, const std::vector<std::pair<std::string, int>> &tileset);
 	~MapView();
 
 	void updateEntities(const std::vector<std::unique_ptr<Model::Entity>> &entities);
-- 
cgit v1.2.3