Put zone previews into atlas

2019-08-27 19:33:41 -04:00
parent 40405332ec
commit 5134aca723
32 changed files with 1176 additions and 1075 deletions
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -239,10 +239,6 @@ public class Vars implements Loadable{
        tmpDirectory = dataDirectory.child("tmp/");

        maps.load();
-        if(!headless){
-            content.loadColors();
-            maps.loadPreviews();
-        }
    }

    public static void loadSettings(){
@@ -251,6 +247,8 @@ public class Vars implements Loadable{
        Core.keybinds.setDefaults(Binding.values());
        Core.settings.load();

+        if(!loadLocales) return;
+
        try{
            //try loading external bundle
            FileHandle handle = Core.files.local("bundle");