X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameWorld.java;h=e6c5633ba78c016b76a521be8244bd929f172787;hb=1c798d88e9c23d438e7fa770c9670b02a761f866;hp=fc0c24712a88999124dac75967302106f7a06401;hpb=cdffa6e04f07103d94e904b82c4a32361e35b370;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index fc0c247..e6c5633 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -1,14 +1,10 @@
 package ru.deadsoftware.cavecraft.game;
 
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.utils.ArrayMap;
+import ru.deadsoftware.cavecraft.game.objects.Drop;
 
 public class GameWorld {
 
     private int WIDTH, HEIGHT;
-
-    private ArrayMap<String, Integer> metaMap;
     private int[][] foreMap;
     private int[][] backMap;
 
@@ -20,6 +16,14 @@ public class GameWorld {
         return HEIGHT;
     }
 
+    public float getWidthPx() {
+        return WIDTH * 16f;
+    }
+
+    public float getHeightPx() {
+        return HEIGHT * 16f;
+    }
+
     public int[][] getFullForeMap() {
         return foreMap;
     }
@@ -28,90 +32,106 @@ public class GameWorld {
         return backMap;
     }
 
-    public int getForeMap(int x, int y) {
+    private int transformX(int x) {
+        x = x % getWidth();
+        if (x < 0) x = getWidth() - Math.abs(x);
+        return x;
+    }
+
+    private int getMap(int x, int y, int layer) {
         int map = 0;
         try {
-            x = x%getWidth();
-            if (x<0) x=getWidth()-Math.abs(x);
-            map = foreMap[x][y];
+            x = transformX(x);
+            map = (layer == 0) ? foreMap[x][y] : backMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
-            Gdx.app.error("GameWorld",e.toString());
         }
         return map;
     }
 
-    public void setForeMap(int x, int y, int value) {
+    private void setMap(int x, int y, int layer, int value) {
         try {
-            x = x%getWidth();
-            if (x<0) x=getWidth()-Math.abs(x);
-            foreMap[x][y] = value;
+            x = transformX(x);
+            if (layer == 0) foreMap[x][y] = value;
+            else backMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
-            Gdx.app.error("GameWorld", e.toString());
         }
     }
 
-    public int getBackMap(int x, int y) {
-        int map = 0;
-        try {
-            x = x%getWidth();
-            if (x<0) x=getWidth()-Math.abs(x);
-            map = backMap[x][y];
-        } catch (ArrayIndexOutOfBoundsException e) {
-            Gdx.app.error("GameWorld",e.toString());
-        }
-        return map;
+    public int getForeMap(int x, int y) {
+        return getMap(x, y, 0);
     }
 
-    public void setBackMap(int x, int y, int value) {
-        try {
-            x = x%getWidth();
-            if (x<0) x=getWidth()-Math.abs(x);
-            backMap[x][y] = value;
-        } catch (ArrayIndexOutOfBoundsException e) {
-            Gdx.app.error("GameWorld", e.toString());
-        }
+    public void setForeMap(int x, int y, int value) {
+        setMap(x, y, 0, value);
+    }
+
+    public int getBackMap(int x, int y) {
+        return getMap(x, y, 1);
     }
 
-    public int getMeta(int x, int y) {
-        if (metaMap.containsKey(x+"_"+y)) return metaMap.get(x+"_"+y);
-            else return 0;
+    public void setBackMap(int x, int y, int value) {
+        setMap(x, y, 1, value);
     }
 
-    public void setMeta(int x, int y, int value) {
-        if (metaMap.containsKey(x+"_"+y)) metaMap.removeKey(x+"_"+y);
-        metaMap.put(x+"_"+y, value);
+    private void placeSlab(int x, int y, int value) {
+        switch (value) {
+            case 51:
+                setForeMap(x, y, 52);
+                break;
+            case 53:
+                setForeMap(x, y, 21);
+                break;
+            case 54:
+                setForeMap(x, y, 5);
+                break;
+            case 55:
+                setForeMap(x, y, 4);
+                break;
+            case 56:
+                setForeMap(x, y, 28);
+                break;
+            case 58:
+                setForeMap(x, y, 57);
+                break;
+        }
     }
 
     public void placeToForeground(int x, int y, int value) {
-        if (getForeMap(x,y) == 0 || value == 0) {
-            setForeMap(x,y,value);
+        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);
         }
+        GameProc.UPD_X = x - 8;
+        GameProc.UPD_Y = y - 8;
+        GameProc.DO_UPD = true;
     }
 
     public void placeToBackground(int x, int y, int value) {
-        if (value==0 || (getBackMap(x,y) == 0 && !Items.BLOCKS.getValueAt(value).background)) {
-            setBackMap(x,y,value);
+        if (value == 0 || (getBackMap(x, y) == 0 && GameItems.getBlock(value).hasCollision()) &&
+                (!GameItems.getBlock(value).isTransparent() || value == 18)) {
+            setBackMap(x, y, value);
         }
     }
 
-    public Vector2 getSpawnPoint() {
-        int x=0,y=0;
-        while (true) {
-            y++;
-            if (getForeMap(x,y)>0 && Items.BLOCKS.getValueAt(getForeMap(x,y)).collision) break;
-        }
-        x = x*16 + 4;
-        y = y*16 - 32;
-        return new Vector2(x,y);
+    public void destroyForeMap(int x, int y, GameProc gp) {
+        if (GameItems.getBlock(getForeMap(x, y)).getDrop() > 0)
+            gp.drops.add(new Drop(transformX(x) * 16 + 4, y * 16 + 4, GameItems.getBlock(getForeMap(x, y)).getDrop()));
+        placeToForeground(x, y, 0);
+    }
+
+    public void destroyBackMap(int x, int y, GameProc gp) {
+        if (GameItems.getBlock(getBackMap(x, y)).getDrop() > 0)
+            gp.drops.add(new Drop(transformX(x) * 16 + 4, y * 16 + 4, GameItems.getBlock(getBackMap(x, y)).getDrop()));
+        placeToBackground(x, y, 0);
     }
 
     public void generate(int w, int h) {
         WIDTH = w;
         HEIGHT = h;
-        WorldGen.genWorld(WIDTH,HEIGHT);
+        WorldGen.genWorld(WIDTH, HEIGHT);
         foreMap = WorldGen.getForeMap();
         backMap = WorldGen.getBackMap();
-        metaMap = new ArrayMap<String, Integer>();
         WorldGen.clear();
     }