Style cleanup, minor Matrix fixes, duplication validations, Pokemod methods

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

1 files changed, 4 insertions, 6 deletions

diff --git a/pokemod/NatureEffect.cpp b/pokemod/NatureEffect.cpp
index 6f040b5f..04ab35f5 100644
--- a/pokemod/NatureEffect.cpp
+++ b/pokemod/NatureEffect.cpp
@@ -26,8 +26,8 @@
 extern PokeGen::PokeMod::Pokemod curPokeMod;

 

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

-   stat(UINT_MAX),

-   multiplier(1, 1)

+      stat(UINT_MAX),

+      multiplier(1, 1)

 {

    LogCtor("NatureEffect", _id);

    id = _id;

@@ -65,7 +65,7 @@ void PokeGen::PokeMod::NatureEffect::Validate(const wxListBox &output)
    if ((curPokeMod.IsSpecialSplit() ? STH_END_GSC : STH_END_RBY) <= stat)

    {

       LogVarNotValid("NatureEffect", id, "stat");

-      output.append(ConsoleLogVarNotValid("NatureEffect", id, "stat"));

+      output.Append(ConsoleLogVarNotValid("NatureEffect", id, "stat"));

       isValid = false;

    }

    multipler.Reduce();

@@ -80,7 +80,6 @@ void PokeGen::PokeMod::NatureEffect::ImportIni(Ini &ini, const unsigned _id)
    if (_id == UINT_MAX)

    {

       ini.GetValue("id", id);

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

       if (id == UINT_MAX)

          LogIdNotFound("NatureEffect");

    }

@@ -98,8 +97,7 @@ void PokeGen::PokeMod::NatureEffect::ImportIni(Ini &ini, const unsigned _id)
 void PokeGen::PokeMod::NatureEffect::ExportIni(std::ofstream &fout, const String &nature) const

 {

    LogExportStart("NatureEffect", id);

-   // Make elements

-   Ini exNatureEffect(nature + " natureEffect");

+   Ini exNatureEffect("natureEffect " + nature);

    exNatureEffect.AddField("id", id);

    exNatureEffect.AddField("stat", stat);

    exNatureEffect.AddField("multiplier-n", multiplier.GetNum());