Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on map format upgrade

Browse Source
This commit is contained in:
Anuken
2019-03-10 22:47:09 -04:00
parent 6f07576748
commit 51f5d04889
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/io/MapIO.java
View File

@@ -7,6 +7,7 @@ import io.anuke.arc.util.Pack;
import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Blocks;
import io.anuke.mindustry.game.MappableContent; import io.anuke.mindustry.game.MappableContent;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.game.Version;
import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.BlockPart; 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{ public static void writeMap(Map map, Tile[][] tiles, DataOutputStream stream) throws IOException{
stream.writeInt(version); stream.writeInt(version);
stream.writeInt(Version.build);
stream.writeByte((byte) map.tags.size); stream.writeByte((byte) map.tags.size);
for(Entry<String, String> entry : map.tags.entries()){ for(Entry<String, String> entry : map.tags.entries()){
@@ -87,7 +89,8 @@ public class MapIO{
public static Map readMap(String useName, DataInputStream stream) throws IOException{ public static Map readMap(String useName, DataInputStream stream) throws IOException{
ObjectMap<String, String> tags = new ObjectMap<>(); ObjectMap<String, String> tags = new ObjectMap<>();
stream.readInt(); //version int version = stream.readInt(); //version
int build = stream.readInt();
byte tagAmount = stream.readByte(); byte tagAmount = stream.readByte();
for(int i = 0; i < tagAmount; i++){ for(int i = 0; i < tagAmount; i++){
@@ -120,7 +123,7 @@ public class MapIO{
Tile tile = new Tile(x, y, floorid, wallid); Tile tile = new Tile(x, y, floorid, wallid);
if(wallid == Blocks.blockpart.id){ if(wallid == Blocks.part.id){
tile.link = stream.readByte(); tile.link = stream.readByte();
}else if(tile.entity != null){ }else if(tile.entity != null){
byte tr = stream.readByte(); byte tr = stream.readByte();