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, 3 insertions, 4 deletions

diff --git a/pokemod/ItemStorage.cpp b/pokemod/ItemStorage.cpp
index 57f09ef5..591f4d8d 100644
--- a/pokemod/ItemStorage.cpp
+++ b/pokemod/ItemStorage.cpp
@@ -73,8 +73,8 @@ void PokeGen::PokeMod::ItemStorage::Validate(const wxListBox &output)
    }

    if (!player)

    {

-      LogVarNotValid("ItemStorage", id, "player");

-      output.Append(ConsoleLogVarNotValid("ItemStorage", id, "player"));

+      LogVarNotValid("ItemStorage", id, "player", name);

+      output.Append(ConsoleLogVarNotValid("ItemStorage", id, "player", name));

       isValid = false;

    }

    LogValidateOver("ItemStorage", id, isValid, name);

@@ -87,13 +87,12 @@ void PokeGen::PokeMod::ItemStorage::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("ItemStorage");

    }

    else

       id = _id;

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

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

    ini.GetValue("computer", computer, 0);

    ini.GetValue("player", player, 1);

    LogImportOver("ItemStorage", id, name);