Fix bugs

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

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
index d314b82cda6929bd1581d373294e52e08bfdcca3..b5c5eab20a717acb6a00c1b7e1263b6026961078 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
@@ -68,8 +68,17 @@ public class GamePhysics {
     }
 
     private void dropPhy(Drop drop) {
-        if (drop.move.y < 9) drop.move.y += gravity.y / 4;
+        if (drop.closeToPlayer(gp) > 0) {
+            drop.moveToPlayer(gp);
+        } else {
+            if (drop.move.x >= .5f) drop.move.x -= .5f;
+            else if (drop.move.x <= -.5f) drop.move.x += .5f;
+            else drop.move.x = 0;
+            if (drop.move.y < 9) drop.move.y += gravity.y / 4;
+        }
         drop.pos.add(drop.move);
+        if (drop.pos.x + 8 > gp.world.getWidth() * 16) drop.pos.x -= gp.world.getWidth() * 16;
+        else if (drop.pos.x < 0) drop.pos.x += gp.world.getWidth() * 16;
         drop.pos.y = MathUtils.round(drop.pos.y);
         while (checkColl(drop.getRect())) {
             drop.pos.y--;
@@ -122,7 +131,7 @@ public class GamePhysics {
         if (pl.pos.x + pl.texWidth / 2 > gp.world.getWidth() * 16)
             pl.pos.x -= gp.world.getWidth() * 16;
         if (pl.pos.y > gp.world.getHeight() * 16) {
-            pl.pos = gp.world.getSpawnPoint().cpy();
+            pl.respawn(gp.world);
         }
         if (CaveGame.TOUCH && checkJump(pl.getRect(), pl.dir) && !pl.flyMode && pl.canJump && pl.move.x != 0) {
             pl.move.add(0, -8);
@@ -185,8 +194,7 @@ public class GamePhysics {
         for (Iterator<Drop> it = gp.drops.iterator(); it.hasNext(); ) {
             Drop drop = it.next();
             dropPhy(drop);
-            if (Intersector.overlaps(drop.getRect(), gp.player.getRect()))
-                drop.pickUpDrop(gp.player);
+            if (Intersector.overlaps(drop.getRect(), gp.player.getRect())) drop.pickUpDrop(gp.player);
             if (drop.pickedUp) it.remove();
         }