Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2020-07-15 10:01:09 -04:00
8 changed files with 449 additions and 350 deletions

View File

@@ -242,6 +242,7 @@ public class SettingsMenuDialog extends SettingsDialog{
if(!mobile){
game.checkPref("buildautopause", false);
}
game.checkPref("mapcenter", true);
if(steam){
game.sliderPref("playerlimit", 16, 2, 32, i -> {

View File

@@ -111,6 +111,12 @@ public class MinimapFragment extends Fragment{
}
public void toggle(){
if(Core.settings.getBool("mapcenter")){
float size = baseSize * zoom * world.width();
float ratio = (float)renderer.minimap.getTexture().getHeight() / renderer.minimap.getTexture().getWidth();
panx = (size/2f - player.x() / (world.width() * tilesize) * size) / zoom;
pany = (size*ratio/2f - player.y() / (world.height() * tilesize) * size*ratio) / zoom;
}
shown = !shown;
}
}