diff --git a/core/src/mindustry/entities/comp/VelComp.java b/core/src/mindustry/entities/comp/VelComp.java index ca04d6a40c..4b0272b5f4 100644 --- a/core/src/mindustry/entities/comp/VelComp.java +++ b/core/src/mindustry/entities/comp/VelComp.java @@ -1,6 +1,5 @@ package mindustry.entities.comp; -import arc.math.*; import arc.math.geom.*; import arc.util.*; import mindustry.annotations.Annotations.*; @@ -22,7 +21,7 @@ abstract class VelComp implements Posc{ @Override public void update(){ move(vel.x * Time.delta, vel.y * Time.delta); - vel.scl(Mathf.clamp(1f - drag * Time.delta)); + vel.scl(Math.max(1f - drag * Time.delta, 0)); } /** @return function to use for check solid state. if null, no checking is done. */ diff --git a/core/src/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/mindustry/ui/dialogs/DatabaseDialog.java index e275e410e0..e936c418fc 100644 --- a/core/src/mindustry/ui/dialogs/DatabaseDialog.java +++ b/core/src/mindustry/ui/dialogs/DatabaseDialog.java @@ -60,9 +60,9 @@ public class DatabaseDialog extends BaseDialog{ list.add(image).size(8 * 4).pad(3); ClickListener listener = new ClickListener(); image.addListener(listener); - if(!Vars.mobile && unlocked(unlock)){ + if(!mobile && unlocked(unlock)){ image.addListener(new HandCursorListener()); - image.update(() -> image.color.lerp(!listener.isOver() ? Color.lightGray : Color.white, 0.4f * Time.delta)); + image.update(() -> image.color.lerp(!listener.isOver() ? Color.lightGray : Color.white, Mathf.clamp(0.4f * Time.delta))); } if(unlocked(unlock)){ @@ -71,7 +71,7 @@ public class DatabaseDialog extends BaseDialog{ Core.app.setClipboardText((char)Fonts.getUnicode(unlock.name) + ""); ui.showInfoFade("@copied"); }else{ - Vars.ui.content.show(unlock); + ui.content.show(unlock); } }); image.addListener(new Tooltip(t -> t.background(Tex.button).add(unlock.localizedName)));