This commit is contained in:
Anuken
2019-09-21 17:51:44 -04:00
parent d062d8081a
commit c45805e703
3 changed files with 6 additions and 0 deletions
@@ -223,6 +223,8 @@ public class Control implements ApplicationListener, Loadable{
logic.reset(); logic.reset();
world.loadMap(map, rules); world.loadMap(map, rules);
state.rules = rules; state.rules = rules;
state.rules.zone = null;
state.rules.editor = false;
logic.play(); logic.play();
if(settings.getBool("savecreate") && !world.isInvalidMap()){ if(settings.getBool("savecreate") && !world.isInvalidMap()){
control.saves.addSave(map.name() + " " + new SimpleDateFormat("MMM dd h:mm", Locale.getDefault()).format(new Date())); control.saves.addSave(map.name() + " " + new SimpleDateFormat("MMM dd h:mm", Locale.getDefault()).format(new Date()));
@@ -283,6 +283,8 @@ public class MapEditorDialog extends Dialog implements Disposable{
} }
public Map save(){ public Map save(){
boolean isEditor = state.rules.editor;
state.rules.editor = false;
String name = editor.getTags().get("name", "").trim(); String name = editor.getTags().get("name", "").trim();
editor.getTags().put("rules", JsonIO.write(state.rules)); editor.getTags().put("rules", JsonIO.write(state.rules));
editor.getTags().remove("width"); editor.getTags().remove("width");
@@ -306,6 +308,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
menu.hide(); menu.hide();
saved = true; saved = true;
state.rules.editor = isEditor;
return returned; return returned;
} }
@@ -195,6 +195,7 @@ public class LoadDialog extends FloatingDialog{
try{ try{
net.reset(); net.reset();
slot.load(); slot.load();
state.rules.editor = false;
state.rules.zone = null; state.rules.zone = null;
state.set(State.playing); state.set(State.playing);
}catch(SaveException e){ }catch(SaveException e){