Fix bugs

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / game / GameWorld.java

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index 97d05cb2d41f5767cd88482f27c238453da61f41..e6b0b006b36460b590c02199df2fb14144c5a7b5 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -2,11 +2,15 @@ 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 {
 
     private final int WIDTH, HEIGHT;
+
     private int[][] foreMap;
     private int[][] backMap;
 
@@ -64,12 +68,15 @@ public class GameWorld {
     }
 
     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) {
+            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);
+        if (value==0 || (getBackMap(x,y) == 0 && !Items.BLOCKS.getValueAt(value).foreground)) {
+            setBackMap(x,y,value);
+        }
     }
 
     public Vector2 getSpawnPoint() {
@@ -79,13 +86,22 @@ public class GameWorld {
         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;
+                        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 (!found) {
+                x--;
+                if (x<0) x=getWidth()-1;
+                if ((int)x == getWidth()/2+1) {
+                    x--;
+                    y=0;
+                    break;
+                }
+            }
         }
         x = x*16 + 4;
         y *= 16;