Renamed some dialogs, final uCore update
This commit is contained in:
@@ -169,10 +169,10 @@ public class LoadDialog extends FloatingDialog{
|
||||
try{
|
||||
slot.load();
|
||||
GameState.set(State.playing);
|
||||
Vars.ui.menu.hide();
|
||||
Vars.ui.paused.hide();
|
||||
}catch(Exception e){
|
||||
e.printStackTrace();
|
||||
Vars.ui.menu.hide();
|
||||
Vars.ui.paused.hide();
|
||||
GameState.set(State.menu);
|
||||
Vars.control.reset();
|
||||
Vars.ui.showError("$text.save.corrupted");
|
||||
|
||||
+2
-2
@@ -15,12 +15,12 @@ import io.anuke.ucore.util.Bundles;
|
||||
|
||||
import static io.anuke.mindustry.Vars.ui;
|
||||
|
||||
public class MenuDialog extends FloatingDialog{
|
||||
public class PausedDialog extends FloatingDialog{
|
||||
private SaveDialog save = new SaveDialog();
|
||||
private LoadDialog load = new LoadDialog();
|
||||
public boolean wasPaused = false;
|
||||
|
||||
public MenuDialog() {
|
||||
public PausedDialog() {
|
||||
super("$text.menu");
|
||||
setup();
|
||||
}
|
||||
@@ -44,11 +44,11 @@ public class SettingsMenuDialog extends SettingsDialog{
|
||||
if(!GameState.is(State.menu)){
|
||||
wasPaused = GameState.is(State.paused);
|
||||
if(menu.getScene() != null){
|
||||
wasPaused = ((io.anuke.mindustry.ui.dialogs.MenuDialog)menu).wasPaused;
|
||||
wasPaused = ((PausedDialog)menu).wasPaused;
|
||||
}
|
||||
if(!Net.active()) GameState.set(State.paused);
|
||||
//TODO hide menu
|
||||
Vars.ui.menu.hide();
|
||||
Vars.ui.paused.hide();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ public class HudFragment implements Fragment{
|
||||
defaults().size(dsize).left();
|
||||
float isize = 40;
|
||||
|
||||
menu = new imagebutton("icon-menu", isize, ui.menu::show).get();
|
||||
menu = new imagebutton("icon-menu", isize, ui.paused::show).get();
|
||||
|
||||
flip = new imagebutton("icon-arrow-up", isize, ()->{
|
||||
if(wavetable.getActions().size != 0) return;
|
||||
|
||||
Reference in New Issue
Block a user