diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
index 3e72368c319ef927efe0492d639a38d86b5d35ba..c0fc292329e7af3909ed7ea52a9d9c5d38ce1854 100644 (file)
package ru.deadsoftware.cavecraft.game;
package ru.deadsoftware.cavecraft.game;
-import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.utils.TimeUtils;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.utils.TimeUtils;
-import ru.deadsoftware.cavecraft.*;
+import ru.deadsoftware.cavecraft.game.mobs.Pig;
+import ru.deadsoftware.cavecraft.misc.AppState;
+import ru.deadsoftware.cavecraft.misc.Assets;
+import ru.deadsoftware.cavecraft.CaveGame;
public class GameInput {
public class GameInput {
break;
case Input.Keys.E:
break;
case Input.Keys.E:
- if (CaveGame.STATE == GameState.GAME_PLAY) CaveGame.STATE = GameState.GAME_CREATIVE_INV;
- else CaveGame.STATE = GameState.GAME_PLAY;
+ if (CaveGame.STATE == AppState.GAME_PLAY) CaveGame.STATE = AppState.GAME_CREATIVE_INV;
+ else CaveGame.STATE = AppState.GAME_PLAY;
break;
break;
- case Input.Keys.N:
- CaveGame.STATE = GameState.RESTART;
+ case Input.Keys.G:
+ gameProc.mobs.add(new Pig(gameProc.cursorX*16, gameProc.cursorY*16));
+ break;
+
+ case Input.Keys.ESCAPE: case Input.Keys.BACK:
+ CaveGame.STATE = AppState.GOTO_MENU;
+ break;
}
}
}
}
}
public void touchDown(int screenX, int screenY, int button) {
}
public void touchDown(int screenX, int screenY, int button) {
- if (CaveGame.STATE == GameState.GAME_CREATIVE_INV &&
+ if (CaveGame.STATE == AppState.GAME_CREATIVE_INV &&
screenX>gameProc.renderer.camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2 &&
screenX<gameProc.renderer.camera.viewportWidth/2+Assets.creativeInv.getRegionWidth()/2 &&
screenY>gameProc.renderer.camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2 &&
screenX>gameProc.renderer.camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2 &&
screenX<gameProc.renderer.camera.viewportWidth/2+Assets.creativeInv.getRegionWidth()/2 &&
screenY>gameProc.renderer.camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2 &&
}
gameProc.player.inventory[0] = item;
}
}
gameProc.player.inventory[0] = item;
}
- } else if (CaveGame.STATE == GameState.GAME_CREATIVE_INV) {
- CaveGame.STATE = GameState.GAME_PLAY;
+ } else if (CaveGame.STATE == AppState.GAME_CREATIVE_INV) {
+ CaveGame.STATE = AppState.GAME_PLAY;
} else {
gameProc.touchDownX = screenX;
gameProc.touchDownY = screenY;
} else {
gameProc.touchDownX = screenX;
gameProc.touchDownY = screenY;