diff --git a/maps/world1.map b/maps/world1.map index 5864c08..b226402 100644 Binary files a/maps/world1.map and b/maps/world1.map differ diff --git a/src/sig/events/WaterEvent.java b/src/sig/events/WaterEvent.java index fa8e253..b0b53cb 100644 --- a/src/sig/events/WaterEvent.java +++ b/src/sig/events/WaterEvent.java @@ -12,15 +12,7 @@ public class WaterEvent implements Event{ @Override public boolean performCollision(int x, int y) { - char val1=RabiClone.CURRENT_MAP.getMap().getDataTileValue(x/Tile.TILE_WIDTH+1, y/Tile.TILE_HEIGHT); - char val2=RabiClone.CURRENT_MAP.getMap().getDataTileValue(x/Tile.TILE_WIDTH, y/Tile.TILE_HEIGHT+1); - if (val1!=Character.MAX_VALUE) { - RabiClone.CURRENT_MAP.getMap().setWaterLevel(val1); - //System.out.println("Water level set to "+(int)RabiClone.CURRENT_MAP.getMap().getWaterLevel()); - } else { - RabiClone.CURRENT_MAP.getMap().setWaterLevel(val2); - //System.out.println("Water level set to "+(int)RabiClone.CURRENT_MAP.getMap().getWaterLevel()); - } + RabiClone.CURRENT_MAP.getMap().setWaterLevel((char)(y/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT)); return true; } diff --git a/src/sig/objects/LevelRenderer.java b/src/sig/objects/LevelRenderer.java index fe5f1b5..90a9bdb 100644 --- a/src/sig/objects/LevelRenderer.java +++ b/src/sig/objects/LevelRenderer.java @@ -1,7 +1,6 @@ package sig.objects; import java.awt.event.KeyEvent; -import java.util.Arrays; import sig.RabiClone; import sig.engine.Action;