Starting INI migration

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@9 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 10 insertions, 25 deletions

diff --git a/pokemod/Frac.cpp b/pokemod/Frac.cpp
index 3fc651eb..3262c67a 100644
--- a/pokemod/Frac.cpp
+++ b/pokemod/Frac.cpp
@@ -37,42 +37,27 @@ PokeGen::PokeMod::Frac::Frac(unsigned n, unsigned d, bool i)
    Set(n, d, i);

 }

 

-void PokeGen::PokeMod::Frac::ImportXml(XmlElement &xml)

+void PokeGen::PokeMod::Frac::ImportIni(Ini &ini)

 {

    LogImportStart("Frac");

-   String curName;

-   num = 1;

-   denom = 1;

-   improper = false;

-   Reduce();

-   xml.ClearCounter();

-   for (XmlElement *child = xml.NextElement(); child; child = xml.NextElement())

-   {

-      curName = child->GetName();

-      if (curName == "num")

-         child->GetValue(num, 1);

-      else if (curName == "denom")

-         child->GetValue(denom, 1);

-      else if (curName == "improper")

-         child->GetValue(improper, false);

-      else

-         LogUnknownXml("Frac", curName);

-   }

+   ini.GetValue("improper", improper, false);

+   ini.GetValue("num", num, 1);

+   ini.GetValue("denom", denom, 1);

    Log(String("Frac Import: Imported %u/%u", num, denom), PM_DEBUG_INFO);

 }

 

-PokeGen::PokeMod::XmlElement PokeGen::PokeMod::Frac::ExportXml(const String &val)

+void PokeGen::PokeMod::Frac::ExportIni(const std::ofstream &fout, const String &val)

 {

    Log(String("Frac Export: Starting %u/%u as %s", num, denom, val.c_str()), PM_DEBUG_INFO);

    // Reduce fraction before storing

    Reduce();

    // Declare the elements

-   XmlElement exFrac(val, 0, true);

-   exFrac.AddElement("num", num);

-   exFrac.AddElement("denom", denom);

-   exFrac.AddElement("improper", improper);

+   Ini exFrac(val);

+   exFrac.AddField("num", num);

+   exFrac.AddField("denom", denom);

+   exFrac.AddField("improper", improper);

+   exFrac.Export(fout);

    Log(String("Frac Export: Finished %u/%u as %s", num, denom, val.c_str()), PM_DEBUG_INFO);

-   return exFrac;

 }

 

 void PokeGen::PokeMod::Frac::Set(unsigned n, unsigned d)