diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index 0c3ac52f40fc1804d29017470e315eaffda5ee0c..88f435b78631f11c1296087bd6b697ca29989d61 100644 (file)
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());
+ //Gdx.app.error("GameWorld",e.toString());
}
return map;
}
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());
+ //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());
+ //Gdx.app.error("GameWorld",e.toString());
}
return map;
}
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());
+ //Gdx.app.error("GameWorld", e.toString());
+ }
+ }
+
+ private void placeSlab(int x, int y, int value) {
+ switch (value) {
+ case 51:
+ setForeMap(x, y, 52);
+ break;
+ case 53:
+ setForeMap(x, y, 21);
+ break;
+ case 54:
+ setForeMap(x, y, 5);
+ break;
+ case 55:
+ setForeMap(x, y, 4);
+ break;
+ case 56:
+ setForeMap(x, y, 28);
+ break;
+ case 58:
+ setForeMap(x, y, 57);
+ break;
}
}
public void placeToForeground(int x, int y, int value) {
- if (getForeMap(x,y) == 0 || value == 0) {
- setForeMap(x,y,value);
+ if (getForeMap(x,y) == 0 || value == 0 || !Items.BLOCKS.getValueAt(getForeMap(x, y)).collision) {
+ setForeMap(x, y, value);
+ } else if (Items.isSlab(value) && getForeMap(x, y) == value) {
+ placeSlab(x, y, value);
}
+ GameProc.UPD_X = x-8;
+ GameProc.UPD_Y = y-8;
+ GameProc.DO_UPD = true;
}
public void placeToBackground(int x, int y, int value) {
- if (value==0 || (getBackMap(x,y) == 0 && !Items.BLOCKS.getValueAt(value).background)) {
+ if (value==0 || (getBackMap(x,y) == 0 && Items.BLOCKS.getValueAt(value).collision) &&
+ (!Items.BLOCKS.getValueAt(value).transparent || value == 18)) {
setBackMap(x,y,value);
}
}