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

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index ab89dd7..064eca5 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -32,10 +32,10 @@ public class GameWorld {
         int map = 0;
         try {
             if (x<0) {
-                x = x % (getWidth()-1)-1;
+                x = x % (getWidth());
                 x = getWidth()- Math.abs(x);
             } else if (x>0) {
-                x = x % (getWidth()-1)+1;
+                x = x % (getWidth());
             }
             map = foreMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
@@ -47,10 +47,10 @@ public class GameWorld {
     public void setForeMap(int x, int y, int value) {
         try {
             if (x<0) {
-                x = x % (getWidth()-1)-1;
+                x = x % (getWidth());
                 x = getWidth()- Math.abs(x);
             } else if (x>0) {
-                x = x % (getWidth()-1)+1;
+                x = x % (getWidth());
             }
             foreMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
@@ -62,10 +62,10 @@ public class GameWorld {
         int map = 0;
         try {
             if (x<0) {
-                x = x % (getWidth()-1)-1;
+                x = x % (getWidth());
                 x = getWidth()- Math.abs(x);
             } else if (x>0) {
-                x = x % (getWidth()-1)+1;
+                x = x % (getWidth());
             }
             map = backMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
@@ -77,10 +77,10 @@ public class GameWorld {
     public void setBackMap(int x, int y, int value) {
         try {
             if (x<0) {
-                x = x % (getWidth()-1)-1;
+                x = x % (getWidth());
                 x = getWidth()- Math.abs(x);
             } else if (x>0) {
-                x = x % (getWidth()-1)+1;
+                x = x % (getWidth());
             }
             backMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
@@ -100,10 +100,14 @@ public class GameWorld {
         }
     }
 
-    public Vector2 getSpawnPoint() {
-        float x=0, y=0;
+    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);
     }