From 2ffffa41620aa0aed797f4a4be3547a3ce351be5 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Fri, 30 Sep 2016 18:02:46 -0400
Subject: [PATCH] v0.4.3: examining tiles now shows the correct visual

---
 .../shatteredpixeldungeon/DungeonTilemap.java        | 12 ++++++------
 .../shatteredpixeldungeon/windows/WndInfoCell.java   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/DungeonTilemap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/DungeonTilemap.java
index a75260514..9d7734227 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/DungeonTilemap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/DungeonTilemap.java
@@ -168,7 +168,7 @@ public class DungeonTilemap extends Tilemap {
 	public synchronized void updateMap() {
 		super.updateMap();
 		for (int i = 0; i < data.length; i++)
-			data[i] = setCellVisuals(i ,map[i]);
+			data[i] = getTileVisual(i ,map[i]);
 	}
 
 	@Override
@@ -177,10 +177,10 @@ public class DungeonTilemap extends Tilemap {
 		super.updateMapCell(cell - mapWidth - 1);
 		super.updateMapCell(cell + mapWidth + 1);
 		for (int i : PathFinder.NEIGHBOURS9)
-			data[cell+i] = setCellVisuals(cell+i, map[cell+i]);
+			data[cell+i] = getTileVisual(cell+i, map[cell+i]);
 	}
 
-	private int setCellVisuals(int pos, int tile){
+	private int getTileVisual(int pos, int tile){
 		int visual = defaultVisuals.get(tile);
 
 		if (tile == Terrain.WATER){
@@ -227,7 +227,7 @@ public class DungeonTilemap extends Tilemap {
 	
 	public void discover( int pos, int oldValue ) {
 		
-		final Image tile = tile( oldValue );
+		final Image tile = tile( pos, oldValue );
 		tile.point( tileToWorld( pos ) );
 
 		parent.add( tile );
@@ -250,9 +250,9 @@ public class DungeonTilemap extends Tilemap {
 			(pos / Dungeon.level.width() + 0.5f) * SIZE );
 	}
 	
-	public static Image tile( int index ) {
+	public static Image tile( int pos, int tile ) {
 		Image img = new Image( instance.texture );
-		img.frame( instance.tileset.get( defaultVisuals.get(index) ) );
+		img.frame( instance.tileset.get( instance.getTileVisual( pos, tile ) ) );
 		return img;
 	}
 	
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java
index d5fd5c642..a6fd313c6 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java
@@ -76,7 +76,7 @@ public class WndInfoCell extends Window {
 				water.frame(0, 0, DungeonTilemap.SIZE, DungeonTilemap.SIZE);
 				titlebar.icon(water);
 			} else {
-				titlebar.icon(DungeonTilemap.tile(tile));
+				titlebar.icon(DungeonTilemap.tile( cell, tile ));
 			}
 			titlebar.label(Dungeon.level.tileName(tile));
 			desc += Dungeon.level.tileDesc(tile);