diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index e86fb3a5e5a5ecbf0c5b2ada365a7ef61c4aee3f..65c9d0300f354eb94aa182de4b1635cc0eed7634 100644 (file)
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavecraft.Items;
public class GameWorld {
private int WIDTH, HEIGHT;
-
private int[][] foreMap;
private int[][] backMap;
return backMap;
}
+ private int transformX(int x) {
+ x = x%getWidth();
+ if (x<0) x=getWidth()-Math.abs(x);
+ return x;
+ }
+
public int getForeMap(int x, int y) {
int map = 0;
try {
- x = x%getWidth();
- if (x<0) x=getWidth()-Math.abs(x);
+ x = transformX(x);
map = foreMap[x][y];
} catch (ArrayIndexOutOfBoundsException e) {
Gdx.app.error("GameWorld",e.toString());
public void setForeMap(int x, int y, int value) {
try {
- x = x%getWidth();
- if (x<0) x=getWidth()-Math.abs(x);
+ x = transformX(x);
foreMap[x][y] = value;
} catch (ArrayIndexOutOfBoundsException e) {
Gdx.app.error("GameWorld", e.toString());
public int getBackMap(int x, int y) {
int map = 0;
try {
- x = x%getWidth();
- if (x<0) x=getWidth()-Math.abs(x);
+ x = transformX(x);
map = backMap[x][y];
} catch (ArrayIndexOutOfBoundsException e) {
Gdx.app.error("GameWorld",e.toString());
public void setBackMap(int x, int y, int value) {
try {
- x = x%getWidth();
- if (x<0) x=getWidth()-Math.abs(x);
+ x = transformX(x);
backMap[x][y] = value;
} catch (ArrayIndexOutOfBoundsException e) {
Gdx.app.error("GameWorld", e.toString());
public void placeToForeground(int x, int y, int value) {
if (getForeMap(x,y) == 0 || value == 0) {
- setForeMap(x,y,value);
+ setForeMap(x, y, value);
}
}
public void placeToBackground(int x, int y, int value) {
- if (value==0 || (getBackMap(x,y) == 0 && !Items.BLOCKS.getValueAt(value).foreground)) {
+ if (value==0 || (getBackMap(x,y) == 0 && Items.BLOCKS.getValueAt(value).collision) &&
+ (!Items.BLOCKS.getValueAt(value).transparent || value == 18)) {
setBackMap(x,y,value);
}
}