diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java
index 89c458523c1a0c53df3f1f3cdf97138c5dbcc3b5..e921b98138ceaabcab6db3d9dff559e4aa9113a0 100644 (file)
package ru.deadsoftware.cavedroid.game;
+import org.jetbrains.annotations.NotNull;
import ru.deadsoftware.cavedroid.game.objects.Block;
import ru.deadsoftware.cavedroid.game.objects.Drop;
import static ru.deadsoftware.cavedroid.GameScreen.GP;
+@SuppressWarnings("WeakerAccess")
public class GameWorld {
private int WIDTH, HEIGHT;
private int[][] foreMap;
private int[][] backMap;
+ GameWorld(int width, int height) {
+ WIDTH = width;
+ HEIGHT = height;
+ WorldGen.genWorld(WIDTH, HEIGHT);
+ foreMap = WorldGen.getForeMap();
+ backMap = WorldGen.getBackMap();
+ WorldGen.clear();
+ }
+
+ GameWorld(@NotNull int[][] foreMap, @NotNull int[][] backMap) {
+ this.foreMap = foreMap.clone();
+ this.backMap = backMap.clone();
+ WIDTH = foreMap.length;
+ HEIGHT = foreMap[0].length;
+ }
+
public int getWidth() {
return WIDTH;
}
return HEIGHT * 16f;
}
- public int[][] getFullForeMap() {
+ int[][] getFullForeMap() {
return foreMap;
}
- public int[][] getFullBackMap() {
+ int[][] getFullBackMap() {
return backMap;
}
}
}
- public boolean hasBlockAt(int x, int y) {
+ public boolean hasForeAt(int x, int y) {
return getMap(x, y, 0) != 0;
}
+ public boolean hasBackAt(int x, int y) {
+ return getMap(x, y, 1) != 0;
+ }
+
public int getForeMap(int x, int y) {
return getMap(x, y, 0);
}
}
public void placeToForeground(int x, int y, int value) {
- if (!hasBlockAt(x, y) || value == 0 || !GameItems.getBlock(getForeMap(x, y)).hasCollision()) {
+ if (!hasForeAt(x, y) || value == 0 || !GameItems.getBlock(getForeMap(x, y)).hasCollision()) {
setForeMap(x, y, value);
} else if (GameItems.isSlab(value) && getForeMap(x, y) == value) {
placeSlab(x, y, value);
placeToBackground(x, y, 0);
}
- public void generate(int w, int h) {
- WIDTH = w;
- HEIGHT = h;
- WorldGen.genWorld(WIDTH, HEIGHT);
- foreMap = WorldGen.getForeMap();
- backMap = WorldGen.getBackMap();
- WorldGen.clear();
- }
-
- void setMaps(int[][] foreMap, int[][] backMap) {
- this.foreMap = foreMap.clone();
- this.backMap = backMap.clone();
- WIDTH = foreMap.length;
- HEIGHT = foreMap[0].length;
- }
-
}
\ No newline at end of file