X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameProc.java;h=afd91343eeda6c06ce04cd02c0a3c4ed68830956;hb=59d48c1b28c570755327a8fb0827fa57e7fd3914;hp=245f0dc5d1d322728e6bf1810ea6986a561916ff;hpb=ef32f2e88b9c0daa411d0c304ce62b1235541fb1;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
index 245f0dc..afd9134 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
@@ -6,12 +6,12 @@ import ru.deadsoftware.cavedroid.GameScreen;
 import ru.deadsoftware.cavedroid.game.mobs.FallingGravel;
 import ru.deadsoftware.cavedroid.game.mobs.FallingSand;
 import ru.deadsoftware.cavedroid.game.mobs.Mob;
+import ru.deadsoftware.cavedroid.game.mobs.Player;
 import ru.deadsoftware.cavedroid.game.objects.Drop;
-import ru.deadsoftware.cavedroid.game.objects.Player;
 import ru.deadsoftware.cavedroid.misc.ControlMode;
 
 import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.LinkedList;
 
 public class GameProc implements Serializable, Disposable {
 
@@ -23,28 +23,21 @@ public class GameProc implements Serializable, Disposable {
 
     static boolean DO_UPD = false;
     static int UPD_X = -1, UPD_Y = -1;
-
-    private transient GameFluidsThread fluidThread;
+    public final Player player;
+    public final LinkedList<Mob> mobs;
+    final LinkedList<Drop> drops;
     public transient GameWorld world;
     public transient GameRenderer renderer;
     public transient GameInput input;
-    transient GamePhysics physics;
-
     public ControlMode controlMode;
-    public final Player player;
-    public final ArrayList<Mob> mobs;
-    final ArrayList<Drop> drops;
-
-    public void resetRenderer() {
-        int scale = CaveGame.TOUCH ? 320 : 480;
-        renderer = new GameRenderer(scale, scale * GameScreen.getHeight() / GameScreen.getWidth());
-    }
+    transient GamePhysics physics;
+    private transient GameFluidsThread fluidThread;
 
     public GameProc(int gameMode) {
         world = new GameWorld(WORLD_WIDTH, WORLD_HEIGHT);
         player = new Player(gameMode);
-        drops = new ArrayList<>();
-        mobs = new ArrayList<>();
+        drops = new LinkedList<>();
+        mobs = new LinkedList<>();
         physics = new GamePhysics();
         input = new GameInput();
         controlMode = CaveGame.TOUCH ? ControlMode.WALK : ControlMode.CURSOR;
@@ -52,6 +45,11 @@ public class GameProc implements Serializable, Disposable {
         startFluidThread();
     }
 
+    public void resetRenderer() {
+        int scale = CaveGame.TOUCH ? 320 : 480;
+        renderer = new GameRenderer(scale, scale * GameScreen.getHeight() / GameScreen.getWidth());
+    }
+
     private void startFluidThread() {
         fluidThread = new GameFluidsThread();
         fluidThread.start();
@@ -104,7 +102,9 @@ public class GameProc implements Serializable, Disposable {
         physics.update();
         input.update();
         blockUpdater();
-        if (fluidThread == null || !fluidThread.isAlive()) startFluidThread();
+        if (fluidThread == null || !fluidThread.isAlive()) {
+            startFluidThread();
+        }
     }
 
     @Override