From 188f039dc74638c971c1cee34744f5d96ed036da Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 8 Oct 2020 23:03:39 -0400 Subject: [PATCH] v0.9.0a: fixed a rare performance bug when density is mis-reported --- .../shatteredpixeldungeon/scenes/PixelScene.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java index 597f3d6c7..80efd93b1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java @@ -41,6 +41,7 @@ import com.watabou.noosa.Gizmo; import com.watabou.noosa.Scene; import com.watabou.noosa.Visual; import com.watabou.noosa.ui.Component; +import com.watabou.utils.GameMath; import com.watabou.utils.Reflection; import java.util.ArrayList; @@ -87,13 +88,7 @@ public class PixelScene extends Scene { defaultZoom = SPDSettings.scale(); if (defaultZoom < Math.ceil( Game.density * 2 ) || defaultZoom > maxDefaultZoom){ - defaultZoom = (int)Math.ceil( Game.density * 2.5 ); - while (( - Game.width / defaultZoom < minWidth || - Game.height / defaultZoom < minHeight - ) && defaultZoom > 1) { - defaultZoom--; - } + defaultZoom = (int)GameMath.gate(2, (int)Math.ceil( Game.density * 2.5 ), maxDefaultZoom); } minZoom = 1;