From 005c43168b97bf2fb13559079f790e4b78bb8cb4 Mon Sep 17 00:00:00 2001 From: toksikk Date: Tue, 4 Nov 2014 10:46:11 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Getter=20f=C3=BCr=20den=20StatusPanel=20hin?= =?UTF-8?q?zugef=C3=BCgt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HeatUp/src/de/heatup/ui/GameInterface.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/HeatUp/src/de/heatup/ui/GameInterface.java b/HeatUp/src/de/heatup/ui/GameInterface.java index 1f2d99b..955de4c 100644 --- a/HeatUp/src/de/heatup/ui/GameInterface.java +++ b/HeatUp/src/de/heatup/ui/GameInterface.java @@ -122,4 +122,7 @@ public class GameInterface extends JFrame { public static JPanel getGamePanel() { return gamePanel; } + public static JPanel getStatusPanel() { + return statusPanel; + } } From 50fb57dc4b313dbb3facb3bf147bee1b66e65d78 Mon Sep 17 00:00:00 2001 From: toksikk Date: Tue, 4 Nov 2014 11:30:24 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Bugfix=20in=20Config=20f=C3=BCr=20Map=20Gen?= =?UTF-8?q?erierung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HeatUp/src/de/heatup/cfg/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HeatUp/src/de/heatup/cfg/Config.java b/HeatUp/src/de/heatup/cfg/Config.java index 79fd2ab..7b8fd5f 100644 --- a/HeatUp/src/de/heatup/cfg/Config.java +++ b/HeatUp/src/de/heatup/cfg/Config.java @@ -16,13 +16,13 @@ public class Config { public static int singleTilePixels = gamePanelWidth/mapMaxTilesWidth; public static void setGamePanelWidth(int width) { // Wir wollen hier keine Reste! - while (width % mapMaxTilesHeight != 0) { + while (width % mapMaxTilesWidth != 0) { width--; } gamePanelWidth = width; updateSingleTilePixels(); } private static void updateSingleTilePixels() { - singleTilePixels = gamePanelWidth/mapMaxTilesHeight; + singleTilePixels = gamePanelWidth/mapMaxTilesWidth; } }