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

diff --git a/pokemod/Item.cpp b/pokemod/Item.cpp
index b0d526a0..7e31aa7b 100644
--- a/pokemod/Item.cpp
+++ b/pokemod/Item.cpp
@@ -42,7 +42,7 @@ PokeGen::PokeMod::Item::Item(Ini &ini, const unsigned _id)
    LogCtorIni("Item", _id);

    ImportIni(ini, _id);

    if (id == UINT_MAX)

-      LogIdError();

+      LogIdError("Item");

 }

 

 PokeGen::PokeMod::Item::~Item()

@@ -56,14 +56,12 @@ void PokeGen::PokeMod::Item::Validate()
    LogValidateStart("Item", id, name);

    if (name == "")

    {

-      LogVarEmpty("Item", id, "name");

-      output.Append(ConsoleLogVarEmpty("Item", id, "name"));

+      LogVarNotSet("Item", id, "name");

       isValid = false;

    }

    if (!curPokeMod.GetItemStorage(type))

    {

-      LogVarNotValid("Item", id, "type", type, name);

-      output.Append(ConsoleLogVarNotValid("Item", id, "type", type, name));

+      LogVarNotValid("Item", id, "type", name);

       isValid = false;

    }

    if (GetItemEffectCount())

@@ -78,7 +76,6 @@ void PokeGen::PokeMod::Item::Validate()
    else

    {

       LogSubmoduleEmpty("Item", id, "effect", name);

-      output.Append(ConsoleLogSubmoduleEmpty("Item", id, "effect", name));

       isValid = false;

    }

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

@@ -214,7 +211,7 @@ int PokeGen::PokeMod::Item::GetType() const
    return type;

 }

 

-PokeGen::PokeMod::String PokeGen::PokeMod::Item::GetType() const

+PokeGen::PokeMod::String PokeGen::PokeMod::Item::GetTypeString() const

 {

    LogFetchVar("Item", id, "type string", type, name);

    if (ItemStorage *i = curPokeMod.GetItemStorage(type))