Ciclic worlds

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

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
index 47b3100aa9164e3f5d4cd22060d46deebc0331b1..6c532ace6a77c6a6537d7b5b0196f44c3e7d08fc 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
@@ -2,12 +2,11 @@ package ru.deadsoftware.cavecraft.game;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
-import com.badlogic.gdx.math.RandomXS128;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.TimeUtils;
 import ru.deadsoftware.cavecraft.*;
-import ru.deadsoftware.cavecraft.game.mobs.Human;
 import ru.deadsoftware.cavecraft.game.mobs.Mob;
+import ru.deadsoftware.cavecraft.game.mobs.Pig;
 import ru.deadsoftware.cavecraft.game.objects.Player;
 
 public class GameProc {
@@ -26,8 +25,8 @@ public class GameProc {
     public int invSlot;
     public int ctrlMode;
 
-    public boolean isTouchDown = false;
-    public int touchDownX, touchDownY;
+    public boolean isTouchDown, isKeyDown;
+    public int touchDownX, touchDownY, keyDownCode;
     public int touchDownButton;
     public long touchDownTime;
 
@@ -37,6 +36,9 @@ public class GameProc {
         physics = new GamePhysics(this);
         player = new Player(world.getSpawnPoint());
         mobs = new Array<Mob>();
+        for (int i=0; i<world.getWidth(); i+=64) {
+            mobs.add(new Pig(i*16, 0, world));
+        }
         if (!CaveGame.TOUCH) ctrlMode = 1;
     }
 
@@ -50,7 +52,7 @@ public class GameProc {
     }
 
     private void moveCursor() {
-        if (ctrlMode==0) {
+        if (ctrlMode==0 && CaveGame.TOUCH) {
             if (player.canJump) {
                 cursorX = (int) (player.position.x + player.texWidth / 2) / 16;
                 if (player.dir == 0) cursorX--;
@@ -75,12 +77,13 @@ public class GameProc {
                     (renderer.camera.viewportWidth/GameScreen.getWidth())+renderer.camera.position.x)/16;
             cursorY = (int)(Gdx.input.getY()*
                     (renderer.camera.viewportHeight/GameScreen.getHeight())+renderer.camera.position.y)/16;
+            if ((Gdx.input.getX()*
+                    (renderer.camera.viewportWidth/GameScreen.getWidth())+renderer.camera.position.x)<0)
+                cursorX--;
         }
     }
 
     private void checkCursorBounds() {
-        if (cursorX < 0) cursorX = 0;
-        if (cursorX >= world.getWidth()) cursorX = world.getWidth()-1;
         if (cursorY < 0) cursorY = 0;
         if (cursorY >= world.getHeight()) cursorY = world.getHeight()-1;
         if (cursorX<(player.position.x+player.texWidth/2)/16)