Closes #5: Reimplement world generator in kotlin

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

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java
index cbf970ced1a84251183cca22cbd9877844ae374a..3bf4981d76d5b5914679f3ed82d2f81adcf979b7 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java
@@ -1,6 +1,8 @@
 package ru.deadsoftware.cavedroid.game;
 
 import com.badlogic.gdx.utils.Disposable;
+import com.badlogic.gdx.utils.TimeUtils;
+import kotlin.Pair;
 import ru.deadsoftware.cavedroid.game.mobs.FallingGravel;
 import ru.deadsoftware.cavedroid.game.mobs.FallingSand;
 import ru.deadsoftware.cavedroid.game.mobs.MobsController;
@@ -43,10 +45,9 @@ public class GameWorld implements Disposable {
         if (isNewGame) {
             mWidth = DEFAULT_WIDTH;
             mHeight = DEFAULT_HEIGHT;
-            WorldGen.genWorld(mWidth, mHeight);
-            mForeMap = WorldGen.getForeMap();
-            mBackMap = WorldGen.getBackMap();
-            WorldGen.clear();
+            Pair<int[][], int[][]> maps = GameWorldGeneratorKt.generate(mWidth, mHeight, TimeUtils.millis());
+            mForeMap = maps.getFirst();
+            mBackMap = maps.getSecond();
             mMobsController.getPlayer().respawn(this);
         } else {
             mForeMap = foreMap;