Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed layout/Unit to UnitScl to prevent name conflicts

Browse Source
This commit is contained in:
Anuken
2019-08-06 11:04:58 -04:00
parent 8ef1d54a16
commit 5c6bcbf9cd
26 changed files with 66 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ios/src/io/anuke/mindustry/IOSLauncher.java
View File

@@ -4,7 +4,7 @@ import com.badlogic.gdx.backends.iosrobovm.IOSApplication;
import com.badlogic.gdx.backends.iosrobovm.IOSApplicationConfiguration;
import io.anuke.arc.Core;
import io.anuke.arc.files.FileHandle;
import io.anuke.arc.scene.ui.layout.Unit;
import io.anuke.arc.scene.ui.layout.UnitScl;
import io.anuke.arc.util.Strings;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.game.Saves.SaveSlot;
@@ -31,9 +31,9 @@ public class IOSLauncher extends IOSApplication.Delegate{
Net.setServerProvider(new ArcNetServer());
if(UIDevice.getCurrentDevice().getUserInterfaceIdiom() == UIUserInterfaceIdiom.Pad){
Unit.dp.addition = 0.5f;
UnitScl.dp.addition = 0.5f;
}else{
Unit.dp.addition = -0.5f;
UnitScl.dp.addition = -0.5f;
}
Platform.instance = new Platform(){