From 51f5d04889ecdc21d7c8b243b2ce99c6b68f82d0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 10 Mar 2019 22:47:09 -0400 Subject: [PATCH] Work on map format upgrade --- core/src/io/anuke/mindustry/io/MapIO.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java index 5d31315e2f..15c8334726 100644 --- a/core/src/io/anuke/mindustry/io/MapIO.java +++ b/core/src/io/anuke/mindustry/io/MapIO.java @@ -7,6 +7,7 @@ import io.anuke.arc.util.Pack; import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.game.MappableContent; import io.anuke.mindustry.game.Team; +import io.anuke.mindustry.game.Version; import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.BlockPart; @@ -41,6 +42,7 @@ public class MapIO{ public static void writeMap(Map map, Tile[][] tiles, DataOutputStream stream) throws IOException{ stream.writeInt(version); + stream.writeInt(Version.build); stream.writeByte((byte) map.tags.size); for(Entry entry : map.tags.entries()){ @@ -87,7 +89,8 @@ public class MapIO{ public static Map readMap(String useName, DataInputStream stream) throws IOException{ ObjectMap tags = new ObjectMap<>(); - stream.readInt(); //version + int version = stream.readInt(); //version + int build = stream.readInt(); byte tagAmount = stream.readByte(); for(int i = 0; i < tagAmount; i++){ @@ -120,7 +123,7 @@ public class MapIO{ Tile tile = new Tile(x, y, floorid, wallid); - if(wallid == Blocks.blockpart.id){ + if(wallid == Blocks.part.id){ tile.link = stream.readByte(); }else if(tile.entity != null){ byte tr = stream.readByte();