da/HeatUp
1
0
Fork 0
mirror of https://github.com/jokerx3/HeatUp synced 2026-07-27 11:39:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:jokerx3/prp

Browse Source
This commit is contained in:
andreas
2014-11-01 22:37:34 +01:00
parent 2fc2d2eaf7 5ac6e861c1
commit 2f51160bf1
2 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HeatUp/src/de/heatup/mapengine/MapEngine.java
+7 -3
View File
@@ -14,6 +14,10 @@ import de.heatup.logging.Logger;
import de.heatup.objects.*; import de.heatup.objects.*;
public class MapEngine { public class MapEngine {
/*
* MAGIC NUMBER SINGLE TILE WIDTH
*/
private static final int singleTileWidth = 25;
final int mapHeight = 24; final int mapHeight = 24;
final int mapWidth = 32; final int mapWidth = 32;
HashMap<Character, ArrayList<Point>> allMapTiles = new HashMap<Character, ArrayList<Point>>(); HashMap<Character, ArrayList<Point>> allMapTiles = new HashMap<Character, ArrayList<Point>>();
@@ -78,11 +82,11 @@ public class MapEngine {
/* /*
* setze x und y auf die koordinaten für das objekt im NÄCHSTEN durchlauf * setze x und y auf die koordinaten für das objekt im NÄCHSTEN durchlauf
*/ */
if (x+25 >= 800) { if (x+singleTileWidth >= 800) {
x = 0; x = 0;
y += 25; y += singleTileWidth;
} else { } else {
x += 25; x += singleTileWidth;
} }
} }
lineCount++; lineCount++;
HeatUp/src/de/heatup/mapengine/MapObjectHandler.java
+19 -8
View File
@@ -36,17 +36,28 @@ public class MapObjectHandler {
MapObjectHandler.allMapObjects.add(newStaticObject); MapObjectHandler.allMapObjects.add(newStaticObject);
} }
} }
/*
* die ganze methode ist unglaublich schlechter und hässlicher programmierstil, aber das weiß ich und ändere ich noch.
*
* mfg daniel. :)
*/
protected static void addAllWallsAndWaysTiles(MapEngine me) { protected static void addAllWallsAndWaysTiles(MapEngine me) {
for (int i = 0; i<me.getAvailableHardwareTileTypes().size(); i++) { ArrayList<Point> allCoordinatesOfWayTileType = me.getAllCoordinatesOfTileType('#');
char currentType = me.getAvailableHardwareTileTypes().get(i); ArrayList<Point> allCoordinatesOfWallTileType = me.getAllCoordinatesOfTileType('-');
if (currentType == '#' || currentType == '-') {
ArrayList<Point> allPointsOfCurrentType = me.getAllCoordinatesOfTileType(currentType); for (int i = 0; i < allCoordinatesOfWayTileType.size(); i++) {
for (int j = 0; j<allPointsOfCurrentType.size(); j++) { Point currentPoint = allCoordinatesOfWayTileType.get(i);
Point currentPoint = allPointsOfCurrentType.get(j); StaticObject newStaticObject = new StaticObject('#', currentPoint);
StaticObject newStaticObject = new StaticObject(currentType, currentPoint);
MapObjectHandler.allMapObjects.add(newStaticObject); MapObjectHandler.allMapObjects.add(newStaticObject);
} }
for (int i = 0; i < allCoordinatesOfWallTileType.size(); i++) {
Point currentPoint = allCoordinatesOfWallTileType.get(i);
StaticObject newStaticObject = new StaticObject('-', currentPoint);
MapObjectHandler.allMapObjects.add(newStaticObject);
} }
}
} }
} }