diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
index 29c8188d9d6c44f07946a8f464913a01fab1e0ea..2bf6e7d096ab17912d6794841661a212841c1988 100644 (file)
if (checkSwim()) {
mPlayer.swim = true;
} else if (mPlayer.canJump()) {
if (checkSwim()) {
mPlayer.swim = true;
} else if (mPlayer.canJump()) {
- mPlayer.getVelocity().add(0, GamePhysics.PL_JUMP_VELOCITY);
+ mPlayer.jump();
} else if (!mPlayer.isFlyMode() && mPlayer.gameMode == 1) {
mPlayer.setFlyMode(true);
mPlayer.getVelocity().y = 0;
} else if (mPlayer.isFlyMode()) {
} else if (!mPlayer.isFlyMode() && mPlayer.gameMode == 1) {
mPlayer.setFlyMode(true);
mPlayer.getVelocity().y = 0;
} else if (mPlayer.isFlyMode()) {
- mPlayer.getVelocity().y = -GamePhysics.PL_SPEED;
+ mPlayer.getVelocity().y = -mPlayer.getSpeed();
}
}
}
}
if (mControlMode == ControlMode.WALK || !mMainConfig.isTouch()) {
switch (keycode) {
case Input.Keys.A:
if (mControlMode == ControlMode.WALK || !mMainConfig.isTouch()) {
switch (keycode) {
case Input.Keys.A:
- mPlayer.getVelocity().x = -GamePhysics.PL_SPEED;
+ mPlayer.getVelocity().x = -mPlayer.getSpeed();
mPlayer.setDir(Mob.Direction.LEFT);
if (mMainConfig.isTouch() && checkSwim()) {
mPlayer.swim = true;
}
break;
case Input.Keys.D:
mPlayer.setDir(Mob.Direction.LEFT);
if (mMainConfig.isTouch() && checkSwim()) {
mPlayer.swim = true;
}
break;
case Input.Keys.D:
- mPlayer.getVelocity().x = GamePhysics.PL_SPEED;
+ mPlayer.getVelocity().x = mPlayer.getSpeed();
mPlayer.setDir(Mob.Direction.RIGHT);
if (mMainConfig.isTouch() && checkSwim()) {
mPlayer.swim = true;
mPlayer.setDir(Mob.Direction.RIGHT);
if (mMainConfig.isTouch() && checkSwim()) {
mPlayer.swim = true;
break;
case Input.Keys.S:
case Input.Keys.CONTROL_LEFT:
break;
case Input.Keys.S:
case Input.Keys.CONTROL_LEFT:
- mPlayer.getVelocity().y = GamePhysics.PL_SPEED;
+ mPlayer.getVelocity().y = mPlayer.getSpeed();
break;
}
} else {
break;
}
} else {