X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameProc.java;h=fd6d0fe748622debb40ff4f5db865388c57f36f8;hb=503cd1720db3f53b7cbf7e3819968044de29a465;hp=bd91e725ef85509829cd2fcf9eab7f30ae054b0c;hpb=5f7d6ee2ded67d412e861f09e102b52efb74d12c;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
index bd91e72..fd6d0fe 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
@@ -1,29 +1,52 @@
 package ru.deadsoftware.cavecraft.game;
 
+import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.TimeUtils;
+import ru.deadsoftware.cavecraft.game.mobs.Human;
+import ru.deadsoftware.cavecraft.game.mobs.Mob;
+import ru.deadsoftware.cavecraft.game.objects.Player;
 
 public class GameProc {
 
     public static double RUN_TIME = 0;
 
+    public Player player;
+
+    public Array<Mob> mobs;
+
     public GameWorld world;
     public GameRenderer renderer;
+    public GamePhysics physics;
 
     public int cursorX, cursorY;
+    public int invSlot;
+    public int ctrlMode;
 
     public boolean isTouchDown = false;
     public int touchDownX, touchDownY;
     public long touchDownTime;
 
     public GameProc() {
-        world = new GameWorld(512,16);
+        world = new GameWorld(512,256);
+        renderer = new GameRenderer(this);
+        physics = new GamePhysics(this);
+        player = new Player();
+        mobs = new Array<Mob>();
+
+    }
+
+    public void resetRenderer() {
         renderer = new GameRenderer(this);
     }
 
     public void update(float delta) {
         RUN_TIME += delta;
+
+        physics.update(delta);
+
         if (isTouchDown && TimeUtils.timeSinceMillis(touchDownTime) > 500) {
-            world.placeToBackground(cursorX,cursorY,1);
+            world.placeToBackground(cursorX,cursorY,
+                    player.inventory[invSlot]);
             isTouchDown = false;
         }
     }