Lots of minor fixes, added TODO file, Move methods

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

1 files changed, 23 insertions, 19 deletions

diff --git a/pokemod/NatureEffect.cpp b/pokemod/NatureEffect.cpp
index 95be307b..93e442f9 100644
--- a/pokemod/NatureEffect.cpp
+++ b/pokemod/NatureEffect.cpp
@@ -23,6 +23,8 @@
 

 #include "NatureEffect.h"

 

+extern PokeGen::PokeMod::Pokemod curPokeMod;

+

 PokeGen::PokeMod::NatureEffect::NatureEffect(const unsigned _id)

 {

    LogCtor("NatureEffect", _id);

@@ -50,34 +52,36 @@ void PokeGen::PokeMod::NatureEffect::Validate(const wxListBox &output)
 void PokeGen::PokeMod::NatureEffect::Validate()

 #endif

 {

-   LogValidateStart("NatureEffect", _id);

+   LogValidateStart("NatureEffect", id);

    // TODO (Validation#1#): NatureEffect Validation

-   LogValidateOver("NatureEffect", _id);

+   LogValidateOver("NatureEffect", id, isValid);

 }

 

 void PokeGen::PokeMod::NatureEffect::ImportIni(Ini &ini, const unsigned _id)

 {

-   PMLog("NatureEffect Import: Starting", PM_DEBUG_INFO);

-   std::string curName;

-   xml.GetAttributeOrDefault("id", &id, UINT_MAX);

-   if (id == UINT_MAX)

-      PMLog("NatureEffect Import: No id attribute found!", PM_DEBUG_ERROR);

-   for (ticpp::Element *child = xml.FirstChildElement(); child; child = child->NextSiblingElement())

+   LogImportStart("NatureEffect");

+   String curName;

+   if (_id == UINT_MAX)

    {

-      curName = child->Value();

-      if (curName == "stat")

-         child->GetTextOrDefault(&stat, 0);

-      else if (curName == "multiplier")

-         multiplier.ImportXml(*child);

-      else

-         PMLog(PMString("NatureEffect Import: Unknown XML element \"%s\"", curName.c_str()), PM_DEBUG_ERROR);

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

+      // Was there an id associated with the section?

+      if (id == UINT_MAX)

+         LogIdNotFound("NatureEffect");

    }

-   PMLog("NatureEffect Import: Finished", PM_DEBUG_INFO);

+   else

+      id = _id;

+   unsigned i;

+   unsigned j;

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

+   ini.GetValue("multiplier-n", i, 1);

+   ini.GetValue("multiplier-d", j, 1);

+   multiplier.Set(i, j);

+   LogImportOver("NatureEffect", id);

 }

 

-void PokeGen::PokeMod::NatureEffect::ExportXml(std::ofstream &fout, const String &nature) const

+void PokeGen::PokeMod::NatureEffect::ExportIni(std::ofstream &fout, const String &nature) const

 {

-   LogExportStart("NatureEffect", id, name);

+   LogExportStart("NatureEffect", id);

    // Make elements

    Ini exNatureEffect(nature + " natureEffect");

    exNatureEffect.AddField("id", id);

@@ -85,7 +89,7 @@ void PokeGen::PokeMod::NatureEffect::ExportXml(std::ofstream &fout, const String
    exNatureEffect.AddField("multiplier-n", multiplier.GetNum());

    exNatureEffect.AddField("multiplier-d", multiplier.GetDenom());

    exNatureEffect.Export(fout);

-   LogExportOver("NatureEffect", id, name);

+   LogExportOver("NatureEffect", id);

 }

 

 void PokeGen::PokeMod::NatureEffect::SetStat(const unsigned s)