X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameWorld.java;h=42050e2fb2d1b06f5bf5a24d888f7ef6f76e2e0b;hb=75e8bbe4c9dceaabd8bb7e7976ad9052cfb0a968;hp=97d05cb2d41f5767cd88482f27c238453da61f41;hpb=a7ae39b1ed142e467b11689cd47010e5b9f90ceb;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index 97d05cb..42050e2 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -2,23 +2,13 @@ package ru.deadsoftware.cavecraft.game;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Vector2;
-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;
     }
@@ -27,69 +17,101 @@ 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());
         }
     }
 
     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);
+            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;
+        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;
+    }
+
 }