diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index fc0c24712a88999124dac75967302106f7a06401..42050e2fb2d1b06f5bf5a24d888f7ef6f76e2e0b 100644 (file)
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.utils.ArrayMap;
public class GameWorld {
private int WIDTH, HEIGHT;
-
- private ArrayMap<String, Integer> metaMap;
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());
}
}
- public int getMeta(int x, int y) {
- if (metaMap.containsKey(x+"_"+y)) return metaMap.get(x+"_"+y);
- else return 0;
- }
-
- public void setMeta(int x, int y, int value) {
- if (metaMap.containsKey(x+"_"+y)) metaMap.removeKey(x+"_"+y);
- metaMap.put(x+"_"+y, value);
- }
-
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);
+ 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);
}
}
WorldGen.genWorld(WIDTH,HEIGHT);
foreMap = WorldGen.getForeMap();
backMap = WorldGen.getBackMap();
- metaMap = new ArrayMap<String, Integer>();
WorldGen.clear();
}