X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGamePhysics.java;h=28a8333214fe4983c95f7e3f5ea868f536384910;hp=244875d9adecb9fbb33c8e2e4882982d5aa01b76;hb=35747c23579243d40294f923b35b23046329f1cd;hpb=75e8bbe4c9dceaabd8bb7e7976ad9052cfb0a968 diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java index 244875d..28a8333 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java @@ -84,6 +84,7 @@ public class GamePhysics { } if (Items.isFluid(getBlock(pl.getRect()))) { + if (CaveGame.TOUCH && pl.moveX.x!=0 && !gameProc.swim && !pl.flyMode) gameProc.swim = true; if (!gameProc.swim) { if (!pl.flyMode && pl.moveY.y < 9) pl.moveY.add(gravity.x / 2, gravity.y / 2); if (!pl.flyMode && pl.moveY.y > 9) pl.moveY.add(0, -.9f); @@ -91,7 +92,10 @@ public class GamePhysics { pl.moveY.add(0, -.5f); if (pl.moveY.y<-3) pl.moveY.y = -3; } - } else if (!pl.flyMode && pl.moveY.y<18) pl.moveY.add(gravity); + } else { + if (!pl.flyMode && pl.moveY.y<18) pl.moveY.add(gravity); + if (CaveGame.TOUCH && gameProc.swim) gameProc.swim = false; + } pl.position.add(pl.moveX); if (checkColl(pl.getRect())) {