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, 20 deletions

diff --git a/pokemod/Flag.cpp b/pokemod/Flag.cpp
index caf0e414..6c317770 100644
--- a/pokemod/Flag.cpp
+++ b/pokemod/Flag.cpp
@@ -30,33 +30,23 @@ PokeGen::PokeMod::Flag::Flag(unsigned f, int s)
    SetStatus(s);

 }

 

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

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

 {

    LogImportStart("Flag");

-   String curName;

-   xml.ClearCounter();   

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

-   {

-      curName = child->GetName();

-      if (curName == "flag")

-         child->GetValue(flag);

-      else if (curName == "state")

-         child->GetValue(status);

-      else

-         LogUnknownXml("Flag", curName);

-   }

-   LogImportOver("Flag", id, name);

+   ini.GetValue("flag", flag, 0);

+   ini.GetValue("status", status, 0);

+   LogImportOver("Flag");

 }

 

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

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

 {

    Log(String("Flag Export: Starting %s", val.c_str()), PM_DEBUG_INFO);

    // Declare the elements

-   XmlElement exFlag(val, 0, true);

-   exFlag.AddElement("flag", flag);

-   exFlag.AddElement("state", status);

+   Ini exFlag(val);

+   exFlag.AddField("flag", flag);

+   exFlag.AddField("status", status);

+   exFlag.Export(fout);

    Log(String("Flag Export: Finished %s", val.c_str()), PM_DEBUG_INFO);

-   return exFlag;

 }

 

 void PokeGen::PokeMod::Flag::SetFlag(unsigned f)

@@ -84,7 +74,7 @@ unsigned PokeGen::PokeMod::Flag::GetFlag()
    return flag;

 }

 

-FlagValue PokeGen::PokeMod::Flag::GetStatus()

+int PokeGen::PokeMod::Flag::GetStatus()

 {

    Log(String("Flag: Fetching the status (%d, %s)", status, FlagValueStr[status]), PM_DEBUG_DEBUG);

    return status;