From 15872210fb25cf57b8b93ed4e247779bc6c028a3 Mon Sep 17 00:00:00 2001 From: toksikk Date: Mon, 3 Nov 2014 15:03:59 +0100 Subject: [PATCH] Karte kann nun skalieren. Config.setGamePanelWidth(int width); --- HeatUp/src/de/heatup/cfg/Config.java | 12 ++++++++++-- HeatUp/src/de/heatup/mapengine/MapEngine.java | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/HeatUp/src/de/heatup/cfg/Config.java b/HeatUp/src/de/heatup/cfg/Config.java index 97e8a30..7c94cb8 100644 --- a/HeatUp/src/de/heatup/cfg/Config.java +++ b/HeatUp/src/de/heatup/cfg/Config.java @@ -5,10 +5,18 @@ package de.heatup.cfg; */ public class Config { /* - * Map related magic numbers + * de.heatup.mapengine.* */ - public static final int singleTilePixels = 25; public static final int triggerAreaAddition = 20; public static final int mapMaxTilesWidth = 32; public static final int mapMaxTilesHeight = 24; + public static int gamePanelWidth = 800; + public static int singleTilePixels = gamePanelWidth/mapMaxTilesWidth; + public static void setGamePanelWidth(int width) { + gamePanelWidth = width; + updateSingleTilePixels(); + } + private static void updateSingleTilePixels() { + singleTilePixels = gamePanelWidth/mapMaxTilesHeight; + } } diff --git a/HeatUp/src/de/heatup/mapengine/MapEngine.java b/HeatUp/src/de/heatup/mapengine/MapEngine.java index 71669d6..5808d1d 100644 --- a/HeatUp/src/de/heatup/mapengine/MapEngine.java +++ b/HeatUp/src/de/heatup/mapengine/MapEngine.java @@ -20,6 +20,7 @@ public class MapEngine { private static final int singleTileWidth = Config.singleTilePixels; private final int mapHeight = Config.mapMaxTilesHeight; private final int mapWidth = Config.mapMaxTilesWidth; + private final int gamePanelWidth = Config.gamePanelWidth; HashMap> allMapTiles = new HashMap>(); ArrayList availableHardwareTileTypes = new ArrayList(); @@ -70,7 +71,7 @@ public class MapEngine { /* * setze x und y auf die koordinaten für das objekt im NÄCHSTEN durchlauf */ - if (x+singleTileWidth >= 800) { + if (x+singleTileWidth >= gamePanelWidth) { x = 0; y += singleTileWidth; } else {