mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-20 20:57:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Power/wave dialog fixes

Browse Source
This commit is contained in:
Anuken
2019-03-17 12:03:48 -04:00
parent e7b813962d
commit 8d44879cc6
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
View File

@ -37,7 +37,13 @@ public class WaveInfoDialog extends FloatingDialog{
this.editor = editor; this.editor = editor;
shown(this::setup); shown(this::setup);
hidden(() -> editor.getTags().put("waves", world.maps.writeWaves(groups))); hidden(() -> {
if(groups == null){
editor.getTags().remove("waves");
}else{
editor.getTags().put("waves", world.maps.writeWaves(groups));
}
});
addCloseButton(); addCloseButton();
buttons.addButton("$settings.reset", () -> ui.showConfirm("$confirm", "$settings.clear.confirm", () ->{ buttons.addButton("$settings.reset", () -> ui.showConfirm("$confirm", "$settings.clear.confirm", () ->{

6
core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
View File

@ -143,6 +143,10 @@ public class PowerGraph{
} }
public void update(){ public void update(){
if(Core.graphics.getFrameId() == lastFrameUpdated){
return;
}
lastFrameUpdated = Core.graphics.getFrameId(); lastFrameUpdated = Core.graphics.getFrameId();
float powerNeeded = getPowerNeeded(); float powerNeeded = getPowerNeeded();
@ -150,7 +154,7 @@ public class PowerGraph{
powerBalance.addValue((powerProduced - powerNeeded) / Time.delta()); powerBalance.addValue((powerProduced - powerNeeded) / Time.delta());
if(Core.graphics.getFrameId() == lastFrameUpdated || (consumers.size == 0 && producers.size == 0 && batteries.size == 0)){ if(consumers.size == 0 && producers.size == 0 && batteries.size == 0){
return; return;
} }