Merge branch 'master' of manuel-voegele.de:inf3

src/Gui/MapPanel.cs

@@ -12,11 +12,11 @@ namespace WorldOfPeacecraft
 		private IBackend Backend;
 
 		private string ImagesFolder = "textures/";
-		private Image BowAndArrow;
 		private Image Dragon1;
 		private Image Dragon2;
 		private Image Dragon3;
 		private Image Forest;
+		private Image ForestStag;
 		private Image ForestLeft;
 		private Image ForestRight;
 		private Image ForestTop;
@@ -53,11 +53,11 @@ namespace WorldOfPeacecraft
 			SetStyle (ControlStyles.OptimizedDoubleBuffer | ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint, true);
 			Backend = backend;
 			this.PreviewKeyDown += board_KeyPress;
-			BowAndArrow = Image.FromFile (ImagesFolder + "bow-and-arrow.png", false);
 			Dragon1 = Image.FromFile (ImagesFolder + "dragon1.png");
 			Dragon2 = Image.FromFile (ImagesFolder + "dragon2.png");
 			Dragon3 = Image.FromFile (ImagesFolder + "dragon3.png");
 			Forest = Image.FromFile (ImagesFolder + "forest.png");
+			ForestStag = Image.FromFile (ImagesFolder + "stag.png");
 			ForestLeft = Image.FromFile (ImagesFolder + "forest_left.png");
 			ForestRight = Image.FromFile (ImagesFolder + "forest_right.png");
 			ForestTop = Image.FromFile (ImagesFolder + "forest_top.png");
@@ -231,7 +231,11 @@ namespace WorldOfPeacecraft
 				}
 			}
 			if (tile.IsForest ()) {
-				PaintImage (g, x, y, Forest);
+				if (tile.IsHuntable ()) {
+					PaintImage (g, x, y, ForestStag);
+				} else {
+					PaintImage (g, x, y, Forest);
+				}
 				if (NullsafeIsForrest(locx - 1, locy, map)) {
 					PaintImage(g, x, y, ForestLeft);
 				}
@@ -253,9 +257,6 @@ namespace WorldOfPeacecraft
 					FlowerCounter++;
 				}
 			}
-			if (tile.IsHuntable ()) {
-				PaintImage (g, x, y, BowAndArrow);
-			}
 		}
 
 		private void PaintWallInnerEdge (Graphics g, int locx, int locy, int x, int y, ITile[,] map)