Starting INI migration

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

1 files changed, 16 insertions, 28 deletions

diff --git a/pokemod/Ability.cpp b/pokemod/Ability.cpp
index 3c88b39a..6f2ddadc 100644
--- a/pokemod/Ability.cpp
+++ b/pokemod/Ability.cpp
@@ -32,17 +32,17 @@ PokeGen::PokeMod::Ability::Ability(unsigned _id)
    id = _id;

 }

 

-PokeGen::PokeMod::Ability::Ability(XmlElement &xml, unsigned _id)

+PokeGen::PokeMod::Ability::Ability(Ini &ini, unsigned _id)

 {

-   LogCtorXml("Ability", id);

-   ImportXml(xml, _id);

+   LogCtorIni("Ability", id);

+   ImportIni(ini, _id);

    if (id == UINT_MAX)

       LogIdError("Ability");

 }

 

 PokeGen::PokeMod::Ability::~Ability()

 {

-   LogDtor("Ability", id, name));

+   LogDtor("Ability", id, name);

 }

 

 void PokeGen::PokeMod::Ability::Validate()

@@ -109,45 +109,33 @@ void PokeGen::PokeMod::Ability::Validate(wxListBox &output)
 }

 #endif

 

-void PokeGen::PokeMod::Ability::ImportXml(XmlElement &xml, unsigned _id)

+void PokeGen::PokeMod::Ability::ImportIni(Ini &ini, unsigned _id)

 {

    LogImportStart("Ability");

-   String curName;

    if (_id == UINT_MAX)

    {

-      xml.GetValue(id);

+      ini.GetValue("id", id, UINT_MAX);

       // Was there an id associated with the element?

       if (id == UINT_MAX)

          LogIdNotFound("Ability");

    }

    else

       id = _id;

-   name = "";

-   effects.clear();

-   xml.ClearCounter();

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

-   {

-      curName = child->GetName();

-      if (curName == "name")

-         child->GetValue(name);

-      else if (curName == "effect")

-         effects.push_back(AbilityEffect(*child));

-      else

-         LogUnknownXml("Ability", curName);

-   }

+   ini.GetValue("name", name, "");

    LogImportOver("Ability", id, name);

 }

 

-XmlElement PokeGen::PokeMod::Ability::ExportXml()

+void PokeGen::PokeMod::Ability::ExportIni(std::ofstream &fout)

 {

    LogExportStart("Ability", id, name);

    // Make elements

-   XmlElement exAbility("ability");

-   exAbility.AddElement("name", name);

+   Ini exAbility("ability");

+   exAbility.AddField("id", id);

+   exAbility.AddField("name", name);

+   exAbility.Export(fout);

    for (std::vector<AbilityEffect>::iterator i = effects.begin(); i != effects.end(); ++i)

-      exAbility.AddElement(i->ExportXml());

+      i->ExportIni(fout, name);

    LogExportOver("Ability", id, name);

-   return exAbility;

 }

 

 void PokeGen::PokeMod::Ability::SetName(const String &n)

@@ -180,7 +168,7 @@ unsigned PokeGen::PokeMod::Ability::GetAbilityEffectCount()
    return effects.size();

 }

 

-void PokeGen::PokeMod::Ability::NewAbilityEffect(XmlElement *xml)

+void PokeGen::PokeMod::Ability::NewAbilityEffect(Ini *ini)

 {

    unsigned i = 0;

    // Find the first unused ID in the vector

@@ -190,8 +178,8 @@ void PokeGen::PokeMod::Ability::NewAbilityEffect(XmlElement *xml)
          break;

    }

    AbilityEffect newAbilityEffect(i);

-   if (xml)

-      newAbilityEffect.ImportXml(*xml);

+   if (ini)

+      newAbilityEffect.ImportXml(*ini);

    LogSubmoduleNew("Ability", "effect", i, id, name);

    effects.push_back(newAbilityEffect);

 }