Code improvements

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / game / GameWorld.java

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index a58a73bb1991fb4a485f806ff61c5df26d118de7..25d3660fc1cf29d9a01b25560e9a2b16baaa4a46 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -16,6 +16,14 @@ public class GameWorld {
         return HEIGHT;
     }
 
         return HEIGHT;
     }
 

+    public float getWidthPx() {
+        return WIDTH * 16f;
+    }
+
+    public float getHeightPx() {
+        return HEIGHT * 16f;
+    }
+

     public int[][] getFullForeMap() {
         return foreMap;
     }
     public int[][] getFullForeMap() {
         return foreMap;
     }


@@ -94,7 +102,7 @@ public class GameWorld {
     }
 
     public void placeToForeground(int x, int y, int value) {
     }
 
     public void placeToForeground(int x, int y, int value) {

-        if (getForeMap(x, y) == 0 || value == 0 || !GameItems.getBlock(getForeMap(x, y)).coll) {
+        if (getForeMap(x, y) == 0 || value == 0 || !GameItems.getBlock(getForeMap(x, y)).hasCollision()) {

             setForeMap(x, y, value);
         } else if (GameItems.isSlab(value) && getForeMap(x, y) == value) {
             placeSlab(x, y, value);
             setForeMap(x, y, value);
         } else if (GameItems.isSlab(value) && getForeMap(x, y) == value) {
             placeSlab(x, y, value);


@@ -105,8 +113,8 @@ public class GameWorld {
     }
 
     public void placeToBackground(int x, int y, int value) {
     }
 
     public void placeToBackground(int x, int y, int value) {

-        if (value == 0 || (getBackMap(x, y) == 0 && GameItems.getBlock(value).coll) &&
-                (!GameItems.getBlock(value).tp || value == 18)) {
+        if (value == 0 || (getBackMap(x, y) == 0 && GameItems.getBlock(value).hasCollision()) &&
+                (!GameItems.getBlock(value).isTransparent() || value == 18)) {

             setBackMap(x, y, value);
         }
     }
             setBackMap(x, y, value);
         }
     }