diff --git a/bin/RabiClone.jar b/bin/RabiClone.jar index bdfe61b..8224fbf 100644 Binary files a/bin/RabiClone.jar and b/bin/RabiClone.jar differ diff --git a/maps/world1.map b/maps/world1.map index 3350da0..ccb095b 100644 Binary files a/maps/world1.map and b/maps/world1.map differ diff --git a/src/sig/RabiClone.java b/src/sig/RabiClone.java index 3a2dff2..a03903d 100644 --- a/src/sig/RabiClone.java +++ b/src/sig/RabiClone.java @@ -6,7 +6,9 @@ import java.util.ArrayList; import java.util.List; import sig.engine.Panel; +import sig.map.Map; import sig.map.Maps; +import sig.map.Tile; import sig.objects.Player; import sig.engine.Object; import java.awt.Toolkit; @@ -42,10 +44,21 @@ public class RabiClone{ f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); f.setVisible(true); - p.render(); - OBJ.add(new Player(p)); + for (int i=0;i<12;i++) { + CURRENT_MAP.getMap().ModifyTile(0, i, Tile.WALL); + } + for (int i=0;i<36;i++) { + CURRENT_MAP.getMap().ModifyTile(i, 11, Tile.FLOOR); + } + for (int i=0;i<10;i++) { + CURRENT_MAP.getMap().ModifyTile(i+5, 8, Tile.PLATFORM_LEDGE); + } + Map.SaveMap(CURRENT_MAP); + + p.render(); + long lastGameTime = System.nanoTime(); while (true) { long timePassed = System.nanoTime()-lastGameTime; diff --git a/src/sig/map/Map.java b/src/sig/map/Map.java index 388eb92..54bef5f 100644 --- a/src/sig/map/Map.java +++ b/src/sig/map/Map.java @@ -2,7 +2,6 @@ package sig.map; import java.io.DataInputStream; import java.io.DataOutputStream; -import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; @@ -17,10 +16,10 @@ public class Map { char[] tiles = new char[MAP_WIDTH*MAP_HEIGHT]; - public static Map LoadMap(File mapFile) { + public static Map LoadMap(Maps map) { try { Map newMap = new Map(); - DataInputStream stream = new DataInputStream(new FileInputStream(mapFile)); + DataInputStream stream = new DataInputStream(new FileInputStream(map.getFile())); int marker=0; while (stream.available()!=0) { newMap.tiles[marker++]=stream.readChar(); @@ -33,12 +32,12 @@ public class Map { return null; } - public static void SaveMap(Map map, File mapFile) { + public static void SaveMap(Maps map) { try { int marker=0; - DataOutputStream stream = new DataOutputStream(new FileOutputStream(mapFile)); - while (marker