X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameWorld.java;h=daa00c004af21ce8356aeec57d0f276d18865376;hb=e0aa1520178df544807f3e803b4b6169346b07fb;hp=68a7a01cb5c8b5faa117f83b5767477c35094032;hpb=62aa73cc7dfd177befe22784940c1bab13d94024;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index 68a7a01..daa00c0 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -1,16 +1,23 @@
 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[][] foreMap;
     private int[][] backMap;
 
     public GameWorld(int w, int h) {
         WIDTH = w;
         HEIGHT = h;
-        foreMap = new int[WIDTH][HEIGHT];
-        backMap = new int[WIDTH][HEIGHT];
+        WorldGen.genWorld(WIDTH,HEIGHT);
+        foreMap = WorldGen.getForeMap();
+        backMap = WorldGen.getBackMap();
+        WorldGen.clear();
     }
 
     public int getWidth() {
@@ -22,19 +29,82 @@ public class GameWorld {
     }
 
     public int getForeMap(int x, int y) {
-        return foreMap[x][y];
+        int map = 0;
+        try {
+            if (x<0) {
+                x = x % (getWidth());
+                x = getWidth()- Math.abs(x);
+            } else if (x>0) {
+                x = x % (getWidth());
+            }
+            map = foreMap[x][y];
+        } catch (ArrayIndexOutOfBoundsException e) {
+            Gdx.app.error("GameWorld",e.toString());
+        }
+        return map;
     }
 
     public void setForeMap(int x, int y, int value) {
-        foreMap[x][y] = value;
+        try {
+            if (x<0) {
+                x = x % (getWidth());
+                x = getWidth()- Math.abs(x);
+            } else if (x>0) {
+                x = x % (getWidth());
+            }
+            foreMap[x][y] = value;
+        } catch (ArrayIndexOutOfBoundsException e) {
+            Gdx.app.error("GameWorld", e.toString());
+        }
     }
 
     public int getBackMap(int x, int y) {
-        return backMap[x][y];
+        int map = 0;
+        try {
+            if (x<0) {
+                x = x % (getWidth());
+                x = getWidth()- Math.abs(x);
+            } else if (x>0) {
+                x = x % (getWidth());
+            }
+            map = backMap[x][y];
+        } catch (ArrayIndexOutOfBoundsException e) {
+            Gdx.app.error("GameWorld",e.toString());
+        }
+        return map;
     }
 
     public void setBackMap(int x, int y, int value) {
-        backMap[x][y] = value;
+        try {
+            if (x<0) {
+                x = x % (getWidth());
+                x = getWidth()- Math.abs(x);
+            } else if (x>0) {
+                x = x % (getWidth());
+            }
+            backMap[x][y] = value;
+        } catch (ArrayIndexOutOfBoundsException e) {
+            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);
+        }
+    }
+
+    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);
+        }
+    }
+
+    public Vector2 getSpawnPoint() {
+        float x=0, y=0;
+        x = x*16 + 4;
+        y *= 16;
+        return new Vector2(x,y);
     }
 
 }