diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
index b616424c313634ddb7e92fabf594969394cff0b5..692eabcb45289a6944150b07cfc6f2dd12959d5c 100644 (file)
package ru.deadsoftware.cavedroid.game.world;
import com.badlogic.gdx.utils.Disposable;
-import com.badlogic.gdx.utils.TimeUtils;
import kotlin.Pair;
import ru.deadsoftware.cavedroid.game.GameItems;
import ru.deadsoftware.cavedroid.game.GameScope;
import javax.annotation.CheckForNull;
import javax.inject.Inject;
-import java.sql.Time;
import java.util.Timer;
@GameScope
public class GameWorld implements Disposable {
- private static final int DEFAULT_WIDTH = 1024;
- private static final int DEFAULT_HEIGHT = 256;
private static final int UPDATE_RANGE = 16;
private final DropController mDropController;
boolean isNewGame = foreMap == null || backMap == null;
if (isNewGame) {
- mWidth = DEFAULT_WIDTH;
- mHeight = DEFAULT_HEIGHT;
- Pair<int[][], int[][]> maps = new GameWorldGenerator(WorldGeneratorConfig.Companion.getDefaultWithSeed()).generate();
+ final WorldGeneratorConfig config = WorldGeneratorConfig.Companion.getDefault();
+ mWidth = config.getWidth();
+ mHeight = config.getHeight();
+ Pair<int[][], int[][]> maps = new GameWorldGenerator(config).generate();
mForeMap = maps.getFirst();
mBackMap = maps.getSecond();
mMobsController.getPlayer().respawn(this);
if (getForeMap(x, y) == 10) {
if (!hasForeAt(x, y + 1) || !getForeMapBlock(x, y + 1).hasCollision()) {
setForeMap(x, y, 0);
- mMobsController.addMob(FallingSand.class, x * 16, y * 16);
+ 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(FallingGravel.class, x * 16, y * 16);
+ mMobsController.addMob(new FallingGravel(x * 16, y * 16));
updateBlock(x, y - 1);
}
}