X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameWorld.java;h=064eca58ffa72052a0b6afd0695aea1772c159c2;hb=f7cc93fff73659b11d3666cdfd92efca1bf403dd;hp=e6b0b006b36460b590c02199df2fb14144c5a7b5;hpb=fe86b2fc3788c58fb134415780b312b4c7ef5c97;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index e6b0b00..064eca5 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -2,9 +2,6 @@ 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.CaveGame;
-import ru.deadsoftware.cavecraft.GameState;
 import ru.deadsoftware.cavecraft.Items;
 
 public class GameWorld {
@@ -32,17 +29,29 @@ public class GameWorld {
     }
 
     public int getForeMap(int x, int y) {
-        int ret = 0;
+        int map = 0;
         try {
-            ret = foreMap[x][y];
+            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 ret;
+        return map;
     }
 
     public void setForeMap(int x, int y, int 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());
@@ -50,17 +59,29 @@ public class GameWorld {
     }
 
     public int getBackMap(int x, int y) {
-        int ret = 0;
+        int map = 0;
         try {
-            ret = backMap[x][y];
+            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 ret;
+        return map;
     }
 
     public void setBackMap(int x, int y, int 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());
@@ -79,32 +100,14 @@ public class GameWorld {
         }
     }
 
-    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 &&
-                        getForeMap((int)x, i-1)==0 && getForeMap((int)x, i-1)==0) {
-                    y = i-2;
-                    found = true;
-                    break;
-                }
-            }
-            if (!found) {
-                x--;
-                if (x<0) x=getWidth()-1;
-                if ((int)x == getWidth()/2+1) {
-                    x--;
-                    y=0;
-                    break;
-                }
-            }
+    public Vector2 getSpawnPoint(int x) {
+        int 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);
     }