From 6d01193e1e39f0b9683dda7b498a1636f870348c Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 15 Jan 2019 23:04:27 -0500 Subject: [PATCH] Tweaks --- core/src/io/anuke/mindustry/entities/TileEntity.java | 1 - core/src/io/anuke/mindustry/io/MapIO.java | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java index c77d797f8a..d570310052 100644 --- a/core/src/io/anuke/mindustry/entities/TileEntity.java +++ b/core/src/io/anuke/mindustry/entities/TileEntity.java @@ -266,7 +266,6 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ //TODO better smoke effect, this one is awful if(health != 0 && health < tile.block().health && !(tile.block() instanceof Wall) && Mathf.chance(0.009f * Time.delta() * (1f - health / tile.block().health))){ - Effects.effect(Fx.smoke, x + Mathf.range(4), y + Mathf.range(4)); } diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java index da11e47183..c6aa3f140a 100644 --- a/core/src/io/anuke/mindustry/io/MapIO.java +++ b/core/src/io/anuke/mindustry/io/MapIO.java @@ -194,7 +194,7 @@ public class MapIO{ } } - public static Map readMap(DataInputStream stream) throws IOException{ + public static Map readMap(String useName, DataInputStream stream) throws IOException{ ObjectMap tags = new ObjectMap<>(); IntIntMap map = new IntIntMap(); @@ -218,6 +218,10 @@ public class MapIO{ map.put(id, block.id); } + return new Map(useName); + } + + public static Tile[][] readTiles(DataInputStream stream) throws IOException{ int width = stream.readShort(); int height = stream.readShort(); @@ -270,6 +274,8 @@ public class MapIO{ tiles[x][y] = tile; } + + return tiles; } public static void writeMapMeta(DataOutputStream stream, MapMeta meta) throws IOException{