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/PokemonItem.cpp b/pokemod/PokemonItem.cpp
index af4a9626..f1c1ceca 100644
--- a/pokemod/PokemonItem.cpp
+++ b/pokemod/PokemonItem.cpp
@@ -26,8 +26,8 @@
 extern PokeGen::PokeMod::Pokemod curPokeMod;

 

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

-   item(UINT_MAX),

-   weight(1)

+      item(UINT_MAX),

+      weight(1)

 {

    LogCtor("PokemonItem", _id);

    id = _id;

@@ -75,7 +75,7 @@ void PokeGen::PokeMod::PokemonItem::Validate(const wxListBox &output)
    if (!weight)

    {

       LogVarNotSet("PokemonItem", id, weight, GetItemString());

-      output.Append(ConsoleLogVarNotSet("PokemonItem", id, weight, GetItemString());

+      output.Append(ConsoleLogVarNotSet("PokemonItem", id, weight, GetItemString()));

       isValid = false;

    }

    LogValidateOver("PokemonItem", id, isValid, GetItemString());

@@ -88,7 +88,6 @@ void PokeGen::PokeMod::PokemonItem::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("PokemonItem");

    }

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

 {

    LogExportStart("PokemonItem", id);

-   // Make elements

-   Ini exPokemonItem(pokemon + " pokemonItem");

+   Ini exPokemonItem("pokemonItem " + pokemon);

    exPokemonItem.AddField("id", id);

    exPokemonItem.AddField("item", item);

    exPokemonItem.AddField("weight", weight);