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

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-03-08 21:53:19 -04:00
parent 863c7ae2bc
commit 0ff3c1ee78
26 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ui/dialogs/DatabaseDialog.java
View File

@@ -91,6 +91,6 @@ public class DatabaseDialog extends FloatingDialog{
}
boolean unlocked(UnlockableContent content){
return (!Vars.state.isCampaign() && !Vars.state.is(State.menu)) || content.unlocked();
return (!Vars.state.isCampaign() && !Vars.state.isMenu()) || content.unlocked();
}
}

4
core/src/mindustry/ui/dialogs/FloatingDialog.java
View File

@@ -24,7 +24,7 @@ public class FloatingDialog extends Dialog{
.growX().height(3f).pad(4f);
hidden(() -> {
if(shouldPause && !state.is(State.menu)){
if(shouldPause && state.isGame()){
if(!wasPaused || net.active()){
state.set(State.playing);
}
@@ -33,7 +33,7 @@ public class FloatingDialog extends Dialog{
});
shown(() -> {
if(shouldPause && !state.is(State.menu)){
if(shouldPause && state.isGame()){
wasPaused = state.is(State.paused);
state.set(State.paused);
}

2
core/src/mindustry/ui/dialogs/PausedDialog.java
View File

@@ -29,7 +29,7 @@ public class PausedDialog extends FloatingDialog{
cont.clear();
update(() -> {
if(state.is(State.menu) && isShown()){
if(state.isMenu() && isShown()){
hide();
}
});

2
core/src/mindustry/ui/dialogs/SaveDialog.java
View File

@@ -15,7 +15,7 @@ public class SaveDialog extends LoadDialog{
super("$savegame");
update(() -> {
if(state.is(State.menu) && isShown()){
if(state.isMenu() && isShown()){
hide();
}
});

2
core/src/mindustry/ui/dialogs/SchematicsDialog.java
View File

@@ -122,7 +122,7 @@ public class SchematicsDialog extends FloatingDialog{
})).size(200f);
}, () -> {
if(sel[0].childrenPressed()) return;
if(state.is(State.menu)){
if(state.isMenu()){
showInfo(s);
}else{
control.input.useSchematic(s);

4
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -37,7 +37,7 @@ public class SettingsMenuDialog extends SettingsDialog{
public SettingsMenuDialog(){
hidden(() -> {
Sounds.back.play();
if(!state.is(State.menu)){
if(state.isGame()){
if(!wasPaused || net.active())
state.set(State.playing);
}
@@ -45,7 +45,7 @@ public class SettingsMenuDialog extends SettingsDialog{
shown(() -> {
back();
if(!state.is(State.menu)){
if(state.isGame()){
wasPaused = state.is(State.paused);
state.set(State.paused);
}