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, 23 insertions, 27 deletions

diff --git a/pokemod/MapWildList.cpp b/pokemod/MapWildList.cpp
index 19fb79cc..90dda382 100644
--- a/pokemod/MapWildList.cpp
+++ b/pokemod/MapWildList.cpp
@@ -30,7 +30,7 @@ PokeGen::PokeMod::MapWildList::MapWildList(const unsigned _id)
    LogCtor("MapWildList", _id);

    control = 0;

    value = 0;

-   times = false;

+   times.clear();

    scope = -1;

    pokemon.clear();

    id = _id;

@@ -56,12 +56,9 @@ void PokeGen::PokeMod::MapWildList::Validate()
 #endif

 {

    isValid = true;

-   PMLog("MapWildList Validation: Starting", PM_DEBUG_INFO);

+   LogValidateStart("MapWildList", id);

    // TODO (Validation#1#): MapWildList Validation

-   if (isValid)

-      PMLog("MapWildList Validation: Passed", PM_DEBUG_INFO);

-   else

-      PMLog("MapWildList Validation: Failed", PM_DEBUG_INFO);

+   LogValidateOver("MapWildList", id, isValid);

 }

 

 void PokeGen::PokeMod::MapWildList::ImportIni(Ini &ini, const unsigned _id)

@@ -79,8 +76,8 @@ void PokeGen::PokeMod::MapWildList::ImportIni(Ini &ini, const unsigned _id)
    unsigned i;

    unsigned j;

    times.clear();

-   ini.GetValue("control", , 0);

-   ini.GetValue("value", , 0);

+   ini.GetValue("control", control, 0);

+   ini.GetValue("value", value, 0);

    ini.GetValue("numTimes", i, 0);

    for (unsigned k = 0; k < i; ++k)

    {

@@ -89,7 +86,7 @@ void PokeGen::PokeMod::MapWildList::ImportIni(Ini &ini, const unsigned _id)
          times.push_back(j);

    }

    ini.GetValue("scope", scope, -1);

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

+   LogImportOver("MapWildList", id);

 }

 

 void PokeGen::PokeMod::MapWildList::ExportIni(std::ofstream &fout, const String &map) const

@@ -105,7 +102,7 @@ void PokeGen::PokeMod::MapWildList::ExportIni(std::ofstream &fout, const String
       exMapWildList.AddField(String("time-%u", i), times[i]);

    exMapWildList.AddField("scope", scope);

    exMapWildList.Export(fout);

-   for (std::vector<MapWildListPokemon>::iterator i = effects.begin(); i != effects.end(); ++i)

+   for (std::vector<MapWildPokemon>::iterator i = pokemon.begin(); i != pokemon.end(); ++i)

       i->ExportIni(fout, map, id);

    LogExportOver("MapWildList", id);

 }

@@ -113,7 +110,7 @@ void PokeGen::PokeMod::MapWildList::ExportIni(std::ofstream &fout, const String
 void PokeGen::PokeMod::MapWildList::SetControl(const unsigned c)

 {

    LogSetVar("MapWildList", id, "control", c);

-   if ((CON_NONE < c) && (c < CON_END))

+   if ((CTRL_NONE < c) && (c < CTRL_END))

       control = c;

 }

 

@@ -124,9 +121,9 @@ void PokeGen::PokeMod::MapWildList::SetValue(const unsigned v)
    LogSetVar("MapWildList", id, "value", v);

    if (Item *item = curPokeMod.GetItem(v))

    {

-      while (i < item->GetEffectCount())

+      while (i < item->GetItemEffectCount())

       {

-         if (ItemEffect *effect = curPokeMod.GetItem(j++))

+         if (ItemEffect *effect = item->GetItemEffect(j++))

          {

             ++i;

             if (effect->GetEffect() == IE_FISH)

@@ -167,9 +164,9 @@ void PokeGen::PokeMod::MapWildList::SetTime(const unsigned ts, const bool t)
    }

 }

 

-void PokeGen::PokeMod::MapWildList::SetTime(const const String &ts, const bool t)

+void PokeGen::PokeMod::MapWildList::SetTime(const String &ts, const bool t)

 {

-   LogSetVar("MapWildList", id, String("time[%u] string", ts), t);

+   LogSetVar("MapWildList", id, String("time[%u] string", ts.c_str()), t);

    SetTime(curPokeMod.GetTime(ts)->GetId(), t);

 }

 

@@ -180,10 +177,9 @@ void PokeGen::PokeMod::MapWildList::SetScope(const unsigned s)
    unsigned j = 0;

    if (Item *item = curPokeMod.GetItem(s))

    {

-      while (i < item->GetEffectCount())

+      while (i < item->GetItemEffectCount())

       {

-         ItemEffect *effect = curPokeMod.GetItem(j++);

-         if (effect)

+         if (ItemEffect *effect = item->GetItemEffect(j++))

          {

             ++i;

             if (effect->GetEffect() == IE_SCOPE)

@@ -225,7 +221,7 @@ bool PokeGen::PokeMod::MapWildList::GetTime(const unsigned ts) const
 

 bool PokeGen::PokeMod::MapWildList::GetTime(const String &ts) const

 {

-   LogFetchVar("MapWildList", id, String("time[%u] string", ts), "???");

+   LogFetchVar("MapWildList", id, String("time[%u] string", ts.c_str()), ts);

    if (Time *t = curPokeMod.GetTime(ts))

       return GetTime(t->GetId());

    return false;

@@ -245,7 +241,7 @@ PokeGen::PokeMod::MapWildPokemon *PokeGen::PokeMod::MapWildList::GetMapWildPokem
       if (pokemon[i].GetId() == _id)

          return &pokemon[i];

    }

-   LogSubmoduleFetch("MapWildList", id, "Pokémon", _id);

+   LogSubmoduleFetchFail("MapWildList", id, "Pokémon", _id);

    return NULL;

 }

 

@@ -257,7 +253,7 @@ PokeGen::PokeMod::MapWildPokemon *PokeGen::PokeMod::MapWildList::GetMapWildPokem
       if (pokemon[i].GetPokemonString() == n)

          return &pokemon[i];

    }

-   LogSubmoduleFetch("MapWildList", id, "Pokémon", _id);

+   LogSubmoduleFetchFail("MapWildList", id, "Pokémon", 0);

    return NULL;

 }

 

@@ -279,20 +275,20 @@ void PokeGen::PokeMod::MapWildList::NewMapWildPokemon(Ini *const ini)
    MapWildPokemon newMapWildPokemon(i);

    if (ini)

       newMapWildPokemon.ImportIni(*ini);

-   LogSubmoduleNew("MapWildList", id, "effect", i, name);

+   LogSubmoduleNew("MapWildList", id, "effect", i);

    pokemon.push_back(newMapWildPokemon);

 }

 

 void PokeGen::PokeMod::MapWildList::DeleteMapWildPokemon(const unsigned _id)

 {

-   LogSubmoduleRemoveStart("MapWildList", id, "Pokémon", _id, name);

-   for (std::vector<MapWildPokemon>::iterator i = effects.begin(); i != effects.end(); ++i)

+   LogSubmoduleRemoveStart("MapWildList", id, "Pokémon", _id);

+   for (std::vector<MapWildPokemon>::iterator i = pokemon.begin(); i != pokemon.end(); ++i)

    {

       if (i->GetId() == _id)

       {

-         LogSubmoduleRemoved("MapWildList", id, "Pokémon", _id, name);

-         effects.erase(i);

+         LogSubmoduleRemoved("MapWildList", id, "Pokémon", _id);

+         pokemon.erase(i);

       }

    }

-   LogSubmoduleRemoveFail("MapWildList", id, "Pokémon", _id, name);

+   LogSubmoduleRemoveFail("MapWildList", id, "Pokémon", _id);

 }