From 066e4380e15873ac7158d1d4208a0413c648bc42 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 13 Sep 2019 08:17:47 -0400 Subject: [PATCH] Crash fix --- core/src/io/anuke/mindustry/core/Renderer.java | 4 ++++ core/src/io/anuke/mindustry/graphics/Pixelator.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 8ed55c2e10..88ce601fb8 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -141,6 +141,10 @@ public class Renderer implements ApplicationListener{ } } + public float landScale(){ + return landTime > 0 ? landscale : 1f; + } + @Override public void dispose(){ minimap.dispose(); diff --git a/core/src/io/anuke/mindustry/graphics/Pixelator.java b/core/src/io/anuke/mindustry/graphics/Pixelator.java index 5637ae8d8a..448e35bffe 100644 --- a/core/src/io/anuke/mindustry/graphics/Pixelator.java +++ b/core/src/io/anuke/mindustry/graphics/Pixelator.java @@ -37,8 +37,8 @@ public class Pixelator implements Disposable{ float px = Core.camera.position.x, py = Core.camera.position.y; Core.camera.position.set((int)px + ((int)(camera.width) % 2 == 0 ? 0 : 0.5f), (int)py + ((int)(camera.height) % 2 == 0 ? 0 : 0.5f)); - int w = (int)(Core.camera.width); - int h = (int)(Core.camera.height); + int w = (int)(Core.camera.width * renderer.landScale()); + int h = (int)(Core.camera.height * renderer.landScale()); if(!graphics.isHidden() && (buffer.getWidth() != w || buffer.getHeight() != h)){ buffer.resize(w, h);