X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fworld%2FGameWorld.java;h=f2fd27dd486fa4a3425bd5edce078769350deb19;hb=f34df6e5eb1052467333f1461c67e75b21eb0d95;hp=f8a5cc970e1749d34eb8abeb7f0f7acacb8df382;hpb=dfe9ff3e9253c250f62ee029411f773916948601;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 f8a5cc9..f2fd27d 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java +++ b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java @@ -26,6 +26,8 @@ public class GameWorld { private final Block[][] mForeMap; private final Block[][] mBackMap; + private final WorldGeneratorConfig mWorldConfig = WorldGeneratorConfig.Companion.getDefault(); + @Inject public GameWorld(DropController dropController, MobsController mobsController, @@ -39,10 +41,9 @@ public class GameWorld { boolean isNewGame = foreMap == null || backMap == null; if (isNewGame) { - final WorldGeneratorConfig config = WorldGeneratorConfig.Companion.getDefault(); - mWidth = config.getWidth(); - mHeight = config.getHeight(); - Pair maps = new GameWorldGenerator(config, mGameItemsHolder).generate(); + mWidth = mWorldConfig.getWidth(); + mHeight = mWorldConfig.getHeight(); + Pair maps = new GameWorldGenerator(mWorldConfig, mGameItemsHolder).generate(); mForeMap = maps.getFirst(); mBackMap = maps.getSecond(); mMobsController.getPlayer().respawn(this, mGameItemsHolder); @@ -200,7 +201,9 @@ public class GameWorld { placeToForeground(x, y, mGameItemsHolder.getFallbackBlock()); } - + public WorldGeneratorConfig getWorldConfig() { + return mWorldConfig; + } public void destroyBackMap(int x, int y) { Block block = getBackMap(x, y);