X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGamePhysics.java;h=34c4df111304a96557ee12ec0f767b3e8bfef40f;hb=01f293d956e7ad17163c67b8f2a2ebfd8f64ac6d;hp=3bcbc9b2bcf0b4b163c2a81a9d768c9e9cf2c99b;hpb=385255cc7b49fbfd3290497367cbc69919b24d4f;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
index 3bcbc9b..34c4df1 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
@@ -1,8 +1,10 @@
 package ru.deadsoftware.cavecraft.game;
 
-import com.badlogic.gdx.math.*;
+import com.badlogic.gdx.math.Intersector;
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.math.Rectangle;
+import com.badlogic.gdx.math.Vector2;
 import ru.deadsoftware.cavecraft.CaveGame;
-import ru.deadsoftware.cavecraft.Items;
 import ru.deadsoftware.cavecraft.game.mobs.Mob;
 import ru.deadsoftware.cavecraft.game.objects.Player;
 
@@ -20,21 +22,13 @@ public class GamePhysics {
     }
 
     private boolean checkJump(Rectangle rect, int dir) {
-        int bl = 0;
+        int bl;
         switch (dir) {
             case 0:
-                if ((int)((rect.x+(rect.width/2))/16) - 1>=0)
-                    bl = gameProc.world.getForeMap(
-                        (int)((rect.x+(rect.width/2))/16) - 1,
-                        (int)(rect.y/16)+1);
-                if (gameProc.world.getForeMap((int)((rect.x+(rect.width/2))/16)-1,(int)(rect.y/16))>0) bl=0;
+                bl = gameProc.world.getForeMap((int)((rect.x-8)/16),(int)((rect.y+rect.height-8)/16));
                 break;
             case 1:
-                if ((int)((rect.x+(rect.width/2))/16) + 1<gameProc.world.getWidth())
-                    bl = gameProc.world.getForeMap(
-                        (int)((rect.x+(rect.width/2))/16) + 1,
-                        (int)(rect.y/16)+1);
-                if (gameProc.world.getForeMap((int)((rect.x+(rect.width/2))/16)+1,(int)(rect.y/16))>0) bl=0;
+                bl = gameProc.world.getForeMap((int)((rect.x+rect.width+8)/16),(int)((rect.y+rect.height-8)/16));
                 break;
             default:
                 bl=0;
@@ -48,9 +42,7 @@ public class GamePhysics {
         int minY = (int) ((rect.y+rect.height/2)/16)-4;
         int maxX = (int) ((rect.x+rect.width/2)/16)+4;
         int maxY = (int) ((rect.y+rect.height/2)/16)+4;
-        if (minX<0) minX=0;
         if (minY<0) minY=0;
-        if (maxX>gameProc.world.getWidth()) maxX = gameProc.world.getWidth();
         if (maxY>gameProc.world.getHeight()) maxY = gameProc.world.getHeight();
         for (int y=minY; y<maxY; y++) {
             for (int x=minX; x<maxX; x++) {
@@ -69,7 +61,7 @@ public class GamePhysics {
         pl.position.add(pl.moveY);
         if (checkColl(pl.getRect())) {
             int d = -1;
-            if (pl.moveY.y<0) d=1; else if (pl.moveY.y>0) d=-1;
+            if (pl.moveY.y<0) d=1;
             if (d==-1) {
                 pl.flyMode = false;
                 pl.canJump = true;
@@ -82,9 +74,6 @@ public class GamePhysics {
         }
         if (!pl.flyMode && pl.moveY.y<18) pl.moveY.add(gravity);
         pl.position.add(pl.moveX);
-        if (pl.position.x<0 ||
-                pl.position.x+pl.texWidth>=gameProc.world.getWidth()*16)
-            pl.position.sub(pl.moveX);
         if (checkColl(pl.getRect())) {
             if (pl.canJump && !pl.flyMode) pl.position.y-=8;
             if (checkColl(pl.getRect())) {
@@ -96,6 +85,8 @@ public class GamePhysics {
                 while (checkColl(pl.getRect())) pl.position.x += d;
             }
         }
+        if (pl.position.x+pl.texWidth/2<0) pl.position.x+=gameProc.world.getWidth()*16;
+        if (pl.position.x+pl.texWidth/2>gameProc.world.getWidth()*16) pl.position.x-=gameProc.world.getWidth()*16;
         if (pl.position.y > gameProc.world.getHeight()*16) {
             pl.position = gameProc.world.getSpawnPoint().cpy();
         }
@@ -108,25 +99,38 @@ public class GamePhysics {
     private void mobPhy(Mob mob) {
         mob.position.add(mob.moveY);
         if (checkColl(mob.getRect())) {
-            mob.canJump = true;
             int d = -1;
-            if (mob.moveY.y<0) d=1; else if (mob.moveY.y>0) d=-1;
+            if (mob.moveY.y<0) d=1;
+            if (d==-1) mob.canJump = true;
             mob.position.y = MathUtils.round(mob.position.y);
             while (checkColl(mob.getRect())) mob.position.y+=d;
             mob.moveY.setZero();
         } else {
             mob.canJump = false;
         }
-        mob.moveY.add(gravity);
+        if (mob.moveY.y<18) mob.moveY.add(gravity);
         mob.position.add(mob.moveX);
-        if (mob.position.x<32 ||
-                mob.position.x+mob.width>gameProc.world.getWidth()*16-32)
-            mob.position.sub(mob.moveX);
         if (checkColl(mob.getRect())) {
-            int d = 0;
-            if (mob.moveX.x<0) d=1; else if (mob.moveX.x>0) d=-1;
-            mob.position.x = MathUtils.round(mob.position.x);
-            while (checkColl(mob.getRect())) mob.position.x+=d;
+            if (mob.canJump) {
+                mob.position.y-=8;
+            }
+            if (checkColl(mob.getRect())) {
+                if (mob.canJump) mob.position.y+=8;
+                int d = 0;
+                if (mob.moveX.x < 0) d = 1;
+                else if (mob.moveX.x > 0) d = -1;
+                mob.position.x = MathUtils.round(mob.position.x);
+                while (checkColl(mob.getRect())) mob.position.x += d;
+            }
+        }
+        if (mob.position.x+mob.width/2<0) mob.position.x+=gameProc.world.getWidth()*16;
+        if (mob.position.x+mob.width/2>gameProc.world.getWidth()*16) mob.position.x-=gameProc.world.getWidth()*16;
+        if (mob.position.y > gameProc.world.getHeight()*16) {
+            mob.position.y = 0;
+        }
+        if (checkJump(mob.getRect(), mob.dir) && mob.canJump && !mob.moveX.equals(Vector2.Zero)) {
+            mob.moveY.add(0, -8);
+            mob.canJump = false;
         }
 }