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

diff --git a/pokemod/MapWildPokemon.cpp b/pokemod/MapWildPokemon.cpp
index fc0714c2..56d456c7 100644
--- a/pokemod/MapWildPokemon.cpp
+++ b/pokemod/MapWildPokemon.cpp
@@ -54,19 +54,16 @@ void PokeGen::PokeMod::MapWildPokemon::Validate()
    if (!curPokeMod.GetPokemon(pokemon))

    {

       LogVarNotValid("MapWildPokemon", id, "pokemon");

-      output.Append(ConsoleLogVarNotValid("MapWildPokemon", id, "pokemon"));

       isValid = false;

    }

    if (curPokeMod.GetMaxLevel() <= level)

    {

       LogVarNotValid("MapWildPokemon", id, "level", GetPokemonString());

-      output.Append(ConsoleLogVarNotValid("MapWildPokemon", id, "level", GetPokemonString()));

       isValid = false;

    }

    if (!weight)

    {

       LogVarNotValid("MapWildPokemon", id, "weight", GetPokemonString());

-      output.Append(ConsoleLogVarNotValid("MapWildPokemon", id, "weight", GetPokemonString()));

       isValid = false;

    }

    LogValidateOver("MapWildPokemon", id, isValid, GetPokemonString());

@@ -114,12 +111,12 @@ void PokeGen::PokeMod::MapWildPokemon::ImportIni(Ini &ini, const unsigned _id)
    ini.GetValue("pokemon", pokemon, -1);

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

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

-   LogImportOver("MapWildPokemon", id, name);

+   LogImportOver("MapWildPokemon", id);

 }

 

 void PokeGen::PokeMod::MapWildPokemon::ExportIni(std::ofstream &fout, const String &map, const unsigned listId) const

 {

-   LogExportStart("MapWildPokemon", id, name);

+   LogExportStart("MapWildPokemon", id);

    // Make elements

    Ini exMapWildPokemon(map + String(" %u mapWildPokemon", listId));

    exMapWildPokemon.AddField("id", id);

@@ -127,7 +124,7 @@ void PokeGen::PokeMod::MapWildPokemon::ExportIni(std::ofstream &fout, const Stri
    exMapWildPokemon.AddField("level", level);

    exMapWildPokemon.AddField("weight", weight);

    exMapWildPokemon.Export(fout);

-   LogExportOver("MapWildPokemon", id, name);

+   LogExportOver("MapWildPokemon", id);

 }

 

 void PokeGen::PokeMod::MapWildPokemon::SetPokemon(const int p)

@@ -140,8 +137,8 @@ void PokeGen::PokeMod::MapWildPokemon::SetPokemon(const int p)
 void PokeGen::PokeMod::MapWildPokemon::SetPokemon(const String &p)

 {

    LogSetVar("MapWildPokemon", id, "pokemon string", p);

-   if (Pokemon *pok = curPokeMod.GetPokemon(p))

-      pokemon = pok->GetId();

+   if (Pokemon *temp = curPokeMod.GetPokemon(p))

+      pokemon = temp->GetId();

 }

 

 void PokeGen::PokeMod::MapWildPokemon::SetLevel(const unsigned l)