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

Balancing

Browse Source
This commit is contained in:
Anuken
2019-01-17 13:03:06 -05:00
parent 47605583d1
commit ccc20a9716
23 changed files with 333 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java
View File

@@ -5,6 +5,7 @@ import io.anuke.arc.collection.ObjectIntMap;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.io.SaveIO.SaveException;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.type.ItemType;
@@ -66,8 +67,15 @@ public class DeployDialog extends FloatingDialog{
addButton(Core.bundle.format("resume", control.saves.getZoneSlot().getZone().localizedName()), () -> {
hide();
ui.loadAnd(() -> {
control.saves.getZoneSlot().load();
state.set(State.playing);
try{
control.saves.getZoneSlot().load();
state.set(State.playing);
}catch(SaveException e){ //make sure to handle any save load errors!
e.printStackTrace();
if(control.saves.getZoneSlot() != null) control.saves.getZoneSlot().delete();
ui.showInfo("$save.corrupted");
show();
}
});
}).size(200f);
}

3
core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
View File

@@ -14,6 +14,7 @@ import io.anuke.arc.scene.ui.TextButton;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.Log;
import io.anuke.arc.util.Strings;
import io.anuke.mindustry.io.SaveIO.SaveException;
import java.io.IOException;
@@ -173,7 +174,7 @@ public class LoadDialog extends FloatingDialog{
try{
slot.load();
state.set(State.playing);
}catch(Exception e){
}catch(SaveException e){
Log.err(e);
state.set(State.menu);
logic.reset();