X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fworld%2FGameWorld.java;h=797e670033ebe4f2abadad58fa96b41cf88b8576;hb=127dbffee03093baee8c11a4e7e152aee0bf5343;hp=d3e56c1a760ba6d9991870343bc2502efee48942;hpb=28d6d78dbd87e28884700bf60d02e554755ae254;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java index d3e56c1..797e670 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java +++ b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java @@ -134,34 +134,14 @@ public class GameWorld { setMap(x, y, 1, id); } - 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 (!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); + final Block block = GameItems.getBlock(value); + if (block.getFullBlockKey() != null) { + setForeMap(x, y, GameItems.getBlockId(block.getFullBlockKey())); + } } }