X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameWorld.java;h=62f7274a85a1caead1664626cb3c46b1c42b25a0;hp=c4655bf157c732368ec685c085af2be42ba9f819;hb=bea2a3c5b967bcd90ccd83e08e833d58449e963a;hpb=103459785743a8485af69863d65ad1b1a2410ab0

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index c4655bf..62f7274 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -1,26 +1,13 @@
 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.Items;
 
 public class GameWorld {
 
-    private final int WIDTH, HEIGHT;
-
+    private int WIDTH, HEIGHT;
     private int[][] foreMap;
     private int[][] backMap;
 
-    public GameWorld(int w, int h) {
-        WIDTH = w;
-        HEIGHT = h;
-        WorldGen.genWorld(WIDTH,HEIGHT);
-        foreMap = WorldGen.getForeMap();
-        backMap = WorldGen.getBackMap();
-        WorldGen.clear();
-    }
-
     public int getWidth() {
         return WIDTH;
     }
@@ -29,72 +16,126 @@ public class GameWorld {
         return HEIGHT;
     }
 
+    public int[][] getFullForeMap() {
+        return foreMap;
+    }
+
+    public int[][] getFullBackMap() {
+        return backMap;
+    }
+
+    private int transformX(int x) {
+        x = x % getWidth();
+        if (x < 0) x = getWidth() - Math.abs(x);
+        return x;
+    }
+
     public int getForeMap(int x, int y) {
-        int ret = 0;
+        int map = 0;
         try {
-            ret = foreMap[x][y];
+            x = transformX(x);
+            map = foreMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
-            Gdx.app.error("GameWorld",e.toString());
+            //Gdx.app.error("GameWorld",e.toString());
         }
-        return ret;
+        return map;
     }
 
     public void setForeMap(int x, int y, int value) {
         try {
+            x = transformX(x);
             foreMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
-            Gdx.app.error("GameWorld", e.toString());
+            //Gdx.app.error("GameWorld", e.toString());
         }
     }
 
     public int getBackMap(int x, int y) {
-        int ret = 0;
+        int map = 0;
         try {
-            ret = backMap[x][y];
+            x = transformX(x);
+            map = backMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
-            Gdx.app.error("GameWorld",e.toString());
+            //Gdx.app.error("GameWorld",e.toString());
         }
-        return ret;
+        return map;
     }
 
     public void setBackMap(int x, int y, int value) {
         try {
+            x = transformX(x);
             backMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
-            Gdx.app.error("GameWorld", e.toString());
+            //Gdx.app.error("GameWorld", e.toString());
+        }
+    }
+
+    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 || !Items.BLOCKS.getValueAt(getForeMap(x, y)).collision) {
+            setForeMap(x, y, value);
+        } else if (Items.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).foreground)) {
-            setBackMap(x,y,value);
+        if (value == 0 || (getBackMap(x, y) == 0 && Items.BLOCKS.getValueAt(value).collision) &&
+                (!Items.BLOCKS.getValueAt(value).transparent || value == 18)) {
+            setBackMap(x, y, value);
         }
     }
 
     public Vector2 getSpawnPoint() {
-        float x=0, y=0;
-        boolean found = false;
-        x = getWidth()/2;
-        while (!found) {
-            for (int i = 0; i < getHeight(); i++) {
-                if (getForeMap((int)x, i)>0 &&
-                        Items.BLOCKS.getValueAt(getForeMap((int)x, i)).collision) {
-                    y = i-3;
-                    found = true;
-                    break;
-                }
-            }
-            if (!found) x--;
+        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 *= 16;
-        return new Vector2(x,y);
+        x = x * 16 + 4;
+        y = y * 16 - 32;
+        return new Vector2(x, y);
+    }
+
+    public void generate(int w, int h) {
+        WIDTH = w;
+        HEIGHT = h;
+        WorldGen.genWorld(WIDTH, HEIGHT);
+        foreMap = WorldGen.getForeMap();
+        backMap = WorldGen.getBackMap();
+        WorldGen.clear();
+    }
+
+    public void setMaps(int[][] foreMap, int[][] backMap) {
+        this.foreMap = foreMap.clone();
+        this.backMap = backMap.clone();
+        WIDTH = foreMap.length;
+        HEIGHT = foreMap[0].length;
     }
 
 }