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

Merge fixes

Browse Source
This commit is contained in:
Anuken
2018-04-28 16:29:23 -04:00
parent e5f6b7f66c
commit 5b8ee48600
5 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/io/anuke/mindustry/game/Tutorial.java
View File

@@ -15,7 +15,6 @@ import io.anuke.ucore.scene.ui.ImageButton;
import io.anuke.ucore.scene.ui.Label;
import io.anuke.ucore.scene.ui.TextButton;
import io.anuke.ucore.util.Bundles;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Tmp;
import static io.anuke.mindustry.Vars.*;
@@ -92,38 +91,11 @@ public class Tutorial{
}
void move(boolean forward){
if(forward && !canMove(forward)){
complete();
}else{
int current = stage.ordinal();
while(true){
current += Mathf.sign(forward);
if(current < 0 || current >= Stage.values().length){
break;
}else if(android == Stage.values()[current].androidOnly || android != Stage.values()[current].desktopOnly){
stage = Stage.values()[current];
stage.onSwitch();
break;
}
}
}
//TODO
}
boolean canMove(boolean forward){
int current = stage.ordinal();
while(true){
current += Mathf.sign(forward);
if(current < 0 || current >= Stage.values().length){
return false;
}else if(android == Stage.values()[current].androidOnly || android != Stage.values()[current].desktopOnly){
return true;
}
}
return true;
}