X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fworld%2FGameWorld.java;h=d3e56c1a760ba6d9991870343bc2502efee48942;hb=894d9f1babeff18c9cbb5f83206ff2c549de0bdb;hp=43fc1641033616ec6645795ead6daed286dc82e3;hpb=47099181db7f7d785c9c471cbaca474ebcb67d95;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
index 43fc164..d3e56c1 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
@@ -1,12 +1,8 @@
 package ru.deadsoftware.cavedroid.game.world;
 
-import com.badlogic.gdx.utils.Disposable;
-import com.badlogic.gdx.utils.Timer;
 import kotlin.Pair;
 import ru.deadsoftware.cavedroid.game.GameItems;
 import ru.deadsoftware.cavedroid.game.GameScope;
-import ru.deadsoftware.cavedroid.game.mobs.FallingGravel;
-import ru.deadsoftware.cavedroid.game.mobs.FallingSand;
 import ru.deadsoftware.cavedroid.game.mobs.MobsController;
 import ru.deadsoftware.cavedroid.game.model.world.generator.WorldGeneratorConfig;
 import ru.deadsoftware.cavedroid.game.objects.Block;
@@ -16,25 +12,16 @@ import javax.annotation.CheckForNull;
 import javax.inject.Inject;
 
 @GameScope
-public class GameWorld implements Disposable {
-
-    private static final int UPDATE_RANGE = 16;
+public class GameWorld {
 
     private final DropController mDropController;
     private final MobsController mMobsController;
 
-    private final Timer mGameFluidsTimer;
-    private final GameFluidsThread mGameFluidsThread;
-
     private final int mWidth;
     private final int mHeight;
     private final int[][] mForeMap;
     private final int[][] mBackMap;
 
-    private boolean mShouldUpdate;
-    private int mUpdateX;
-    private int mUpdateY;
-
     @Inject
     public GameWorld(DropController dropController,
                      MobsController mobsController,
@@ -59,11 +46,6 @@ public class GameWorld implements Disposable {
             mWidth = mForeMap.length;
             mHeight = mForeMap[0].length;
         }
-
-        mGameFluidsThread = new GameFluidsThread(this, mMobsController);
-
-        mGameFluidsTimer = new Timer();
-        mGameFluidsTimer.scheduleTask(mGameFluidsThread, 0, GameFluidsThread.FLUID_UPDATE_INTERVAL_SEC);
     }
 
     public int getWidth() {
@@ -181,9 +163,6 @@ public class GameWorld implements Disposable {
         } else if (GameItems.isSlab(value) && getForeMap(x, y) == value) {
             placeSlab(x, y, value);
         }
-        mUpdateX = x - 8;
-        mUpdateY = y - 8;
-        mShouldUpdate = true;
     }
 
     public void placeToBackground(int x, int y, int value) {
@@ -208,52 +187,4 @@ public class GameWorld implements Disposable {
         }
         placeToBackground(x, y, 0);
     }
-
-    private void updateBlock(int x, int y) {
-        if (getForeMap(x, y) == 10) {
-            if (!hasForeAt(x, y + 1) || !getForeMapBlock(x, y + 1).hasCollision()) {
-                setForeMap(x, y, 0);
-                mMobsController.addMob(new FallingSand(x * 16, y * 16));
-                updateBlock(x, y - 1);
-            }
-        }
-
-        if (getForeMap(x, y) == 11) {
-            if (!hasForeAt(x, y + 1) || !getForeMapBlock(x, y + 1).hasCollision()) {
-                setForeMap(x, y, 0);
-                mMobsController.addMob(new FallingGravel(x * 16, y * 16));
-                updateBlock(x, y - 1);
-            }
-        }
-
-        if (hasForeAt(x, y) && getForeMapBlock(x, y).requiresBlock()) {
-            if (!hasForeAt(x, y + 1) || !getForeMapBlock(x, y + 1).hasCollision()) {
-                destroyForeMap(x, y);
-                updateBlock(x, y - 1);
-            }
-        }
-
-        if (getForeMap(x, y) == 2) {
-            if (hasForeAt(x, y - 1) && (getForeMapBlock(x, y - 1).hasCollision() ||
-                    GameItems.isFluid(getForeMap(x, y - 1)))) {
-                setForeMap(x, y, 3);
-            }
-        }
-    }
-
-    public void update() {
-        if (mShouldUpdate) {
-            for (int y = mUpdateY; y < mUpdateY + UPDATE_RANGE; y++) {
-                for (int x = mUpdateX; x < mUpdateX + UPDATE_RANGE; x++) {
-                    updateBlock(x, y);
-                }
-            }
-            mShouldUpdate = false;
-        }
-    }
-
-    @Override
-    public void dispose() {
-        mGameFluidsThread.cancel();
-    }
 }
\ No newline at end of file