diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index a58a73bb1991fb4a485f806ff61c5df26d118de7..e6c5633ba78c016b76a521be8244bd929f172787 100644 (file)
return HEIGHT;
}
+ public float getWidthPx() {
+ return WIDTH * 16f;
+ }
+
+ public float getHeightPx() {
+ return HEIGHT * 16f;
+ }
+
public int[][] getFullForeMap() {
return foreMap;
}
return x;
}
- public int getForeMap(int x, int y) {
+ private int getMap(int x, int y, int layer) {
int map = 0;
try {
x = transformX(x);
- map = foreMap[x][y];
+ map = (layer == 0) ? foreMap[x][y] : backMap[x][y];
} catch (ArrayIndexOutOfBoundsException e) {
- //Gdx.app.error("GameWorld",e.toString());
}
return map;
}
- public void setForeMap(int x, int y, int value) {
+ private void setMap(int x, int y, int layer, int value) {
try {
x = transformX(x);
- foreMap[x][y] = value;
+ if (layer == 0) foreMap[x][y] = value;
+ else backMap[x][y] = value;
} catch (ArrayIndexOutOfBoundsException e) {
- //Gdx.app.error("GameWorld", e.toString());
}
}
+ public int getForeMap(int x, int y) {
+ return getMap(x, y, 0);
+ }
+
+ public void setForeMap(int x, int y, int value) {
+ setMap(x, y, 0, value);
+ }
+
public int getBackMap(int x, int y) {
- int map = 0;
- try {
- x = transformX(x);
- map = backMap[x][y];
- } catch (ArrayIndexOutOfBoundsException e) {
- //Gdx.app.error("GameWorld",e.toString());
- }
- return map;
+ return getMap(x, y, 1);
}
public void setBackMap(int x, int y, int value) {
- try {
- x = transformX(x);
- backMap[x][y] = value;
- } catch (ArrayIndexOutOfBoundsException e) {
- //Gdx.app.error("GameWorld", e.toString());
- }
+ setMap(x, y, 1, value);
}
private void placeSlab(int x, int y, int value) {
}
public void placeToForeground(int x, int y, int value) {
- if (getForeMap(x, y) == 0 || value == 0 || !GameItems.getBlock(getForeMap(x, y)).coll) {
+ if (getForeMap(x, y) == 0 || 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);
}
public void placeToBackground(int x, int y, int value) {
- if (value == 0 || (getBackMap(x, y) == 0 && GameItems.getBlock(value).coll) &&
- (!GameItems.getBlock(value).tp || value == 18)) {
+ if (value == 0 || (getBackMap(x, y) == 0 && GameItems.getBlock(value).hasCollision()) &&
+ (!GameItems.getBlock(value).isTransparent() || value == 18)) {
setBackMap(x, y, value);
}
}