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, 6 insertions, 8 deletions

diff --git a/pokemod/PokemonNature.cpp b/pokemod/PokemonNature.cpp
index 27c402a0..c4c1ad39 100644
--- a/pokemod/PokemonNature.cpp
+++ b/pokemod/PokemonNature.cpp
@@ -26,8 +26,8 @@
 extern PokeGen::PokeMod::Pokemod curPokeMod;

 

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

-   nature(UINT_MAX),

-   weight(1)

+      nature(UINT_MAX),

+      weight(1)

 {

    LogCtor("PokemonNature", _id);

    id = _id;

@@ -76,9 +76,9 @@ void PokeGen::PokeMod::PokemonNature::Validate(const wxListBox &output)
    {

       LogVarNotSet("PokemonNature", id, "weight", GetNatureString());

       output.Append(ConsoleLogVarNotSet("PokemonNature", id, weight, GetNatureString());

-      isValid = false;

-   }

-   LogValidateOver("PokemonNature", id, isValid, GetNatureString());

+                    isValid = false;

+                 }

+                 LogValidateOver("PokemonNature", id, isValid, GetNatureString());

 }

 #endif

 

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

    {

       ini.GetValue("id", id);

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

       if (id == UINT_MAX)

          LogIdNotFound("PokemonNature");

    }

@@ -102,8 +101,7 @@ void PokeGen::PokeMod::PokemonNature::ImportIni(Ini &ini, const unsigned _id)
 void PokeGen::PokeMod::PokemonNature::ExportIni(std::ofstream &fout, const String &pokemon) const

 {

    LogExportStart("PokemonNature", id);

-   // Make elements

-   Ini exPokemonNature(pokemon + " pokemonNature");

+   Ini exPokemonNature("pokemonNature " + pokemon);

    exPokemonNature.AddField("id", id);

    exPokemonNature.AddField("nature", nature);

    exPokemonNature.AddField("weight", weight);