archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

file-format: save/restore the "noDisasters" option

Browse source
This commit is contained in:
Jason Long 2013-07-28 22:14:31 -04:00
parent 8ac2e902bc
commit 95155a579f
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/micropolisj/engine/Micropolis.java
View file

@ -1958,6 +1958,11 @@ public class Micropolis
XML_Helper.skipToEndElement(in); XML_Helper.skipToEndElement(in);
} }
static String nvl(String x, String d)
{
return x != null ? x : d;
}
void loadMisc_v2(XMLStreamReader in) void loadMisc_v2(XMLStreamReader in)
throws XMLStreamException throws XMLStreamException
{ {
@ -1974,6 +1979,7 @@ public class Micropolis
autoBulldoze = Boolean.parseBoolean(in.getAttributeValue(null, "autoBulldoze")); autoBulldoze = Boolean.parseBoolean(in.getAttributeValue(null, "autoBulldoze"));
autoBudget = Boolean.parseBoolean(in.getAttributeValue(null, "autoBudget")); autoBudget = Boolean.parseBoolean(in.getAttributeValue(null, "autoBudget"));
autoGo = Boolean.parseBoolean(in.getAttributeValue(null, "autoGo")); autoGo = Boolean.parseBoolean(in.getAttributeValue(null, "autoGo"));
noDisasters = !Boolean.parseBoolean(nvl(in.getAttributeValue(null, "allowDisasters"), "true"));
simSpeed = Speed.valueOf(in.getAttributeValue(null, "simSpeed")); simSpeed = Speed.valueOf(in.getAttributeValue(null, "simSpeed"));
XML_Helper.skipToEndElement(in); XML_Helper.skipToEndElement(in);
@ -2074,6 +2080,7 @@ public class Micropolis
out.writeAttribute("autoBudget", Boolean.toString(autoBudget)); out.writeAttribute("autoBudget", Boolean.toString(autoBudget));
out.writeAttribute("autoGo", Boolean.toString(autoGo)); out.writeAttribute("autoGo", Boolean.toString(autoGo));
out.writeAttribute("simSpeed", simSpeed.name()); out.writeAttribute("simSpeed", simSpeed.name());
out.writeAttribute("allowDisasters", Boolean.toString(!noDisasters));
out.writeEndElement(); out.writeEndElement();
out.writeStartElement("evaluation"); out.writeStartElement("evaluation");