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

Experimental multiplayer pausing variable

Browse Source
This commit is contained in:
Anuken
2022-10-31 20:19:39 -04:00
parent 4e8e65d1dd
commit 6aeeb23d7c
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
core/src/mindustry/ui/fragments/HudFragment.java
View File

@@ -147,14 +147,14 @@ public class HudFragment{
if(net.active()){
ui.listfrag.toggle();
}else{
state.set(state.is(State.paused) ? State.playing : State.paused);
state.set(state.isPaused() ? State.playing : State.paused);
}
}).name("pause").update(i -> {
if(net.active()){
i.getStyle().imageUp = Icon.players;
}else{
i.setDisabled(false);
i.getStyle().imageUp = state.is(State.paused) ? Icon.play : Icon.pause;
i.getStyle().imageUp = state.isPaused() ? Icon.play : Icon.pause;
}
});