1 files changed, 14 insertions, 16 deletions
diff --git a/pokemod/MapWildList.cpp b/pokemod/MapWildList.cpp
index 9973a8be..19fb79cc 100644
--- a/pokemod/MapWildList.cpp
+++ b/pokemod/MapWildList.cpp
@@ -25,7 +25,7 @@
 
 extern PokeGen::PokeMod::Pokemod curPokeMod;
 
-PokeGen::PokeMod::MapWildList::MapWildList(unsigned _id)
+PokeGen::PokeMod::MapWildList::MapWildList(const unsigned _id)
 {
    LogCtor("MapWildList", _id);
    control = 0;
@@ -36,7 +36,7 @@ PokeGen::PokeMod::MapWildList::MapWildList(unsigned _id)
    id = _id;
 }
 
-PokeGen::PokeMod::MapWildList::MapWildList(Ini &ini, unsigned _id)
+PokeGen::PokeMod::MapWildList::MapWildList(Ini &ini, const unsigned _id)
 {
    LogCtorIni("MapWildList", _id);
    ImportIni(ini, _id);
@@ -50,7 +50,7 @@ PokeGen::PokeMod::MapWildList::~MapWildList()
 }
 
 #ifdef PG_DEBUG_WINDOW
-void PokeGen::PokeMod::MapWildList::Validate(wxListBox &output)
+void PokeGen::PokeMod::MapWildList::Validate(const wxListBox &output)
 #else
 void PokeGen::PokeMod::MapWildList::Validate()
 #endif
@@ -64,7 +64,7 @@ void PokeGen::PokeMod::MapWildList::Validate()
       PMLog("MapWildList Validation: Failed", PM_DEBUG_INFO);
 }
 
-void PokeGen::PokeMod::MapWildList::ImportIni(Ini &ini, unsigned _id)
+void PokeGen::PokeMod::MapWildList::ImportIni(Ini &ini, const unsigned _id)
 {
    LogImportStart("MapWildList");
    if (_id == UINT_MAX)
@@ -110,14 +110,14 @@ void PokeGen::PokeMod::MapWildList::ExportIni(std::ofstream &fout, const String
    LogExportOver("MapWildList", id);
 }
 
-void PokeGen::PokeMod::MapWildList::SetControl(unsigned c)
+void PokeGen::PokeMod::MapWildList::SetControl(const unsigned c)
 {
    LogSetVar("MapWildList", id, "control", c);
    if ((CON_NONE < c) && (c < CON_END))
       control = c;
 }
 
-void PokeGen::PokeMod::MapWildList::SetValue(unsigned v)
+void PokeGen::PokeMod::MapWildList::SetValue(const unsigned v)
 {
    unsigned i = 0;
    unsigned j = 0;
@@ -146,20 +146,18 @@ void PokeGen::PokeMod::MapWildList::SetValue(const String &v)
       SetValue(i->GetId());
 }
 
-void PokeGen::PokeMod::MapWildList::SetTime(unsigned ts, bool t)
+void PokeGen::PokeMod::MapWildList::SetTime(const unsigned ts, const bool t)
 {
    for (std::vector<unsigned>::iterator i = times.begin(); i != times.end(); ++i)
    {
       if (*i == ts)
       {
-         if (t)
-            return;
-         else
+         if (!t)
          {
             times.erase(i);
             LogSetVar("MapWildList", id, String("time[%u]", ts), false);
-            return;
          }
+         return;
       }
    }
    if (t)
@@ -169,13 +167,13 @@ void PokeGen::PokeMod::MapWildList::SetTime(unsigned ts, bool t)
    }
 }
 
-void PokeGen::PokeMod::MapWildList::SetTime(const String &ts, bool t)
+void PokeGen::PokeMod::MapWildList::SetTime(const const String &ts, const bool t)
 {
    LogSetVar("MapWildList", id, String("time[%u] string", ts), t);
    SetTime(curPokeMod.GetTime(ts)->GetId(), t);
 }
 
-void PokeGen::PokeMod::MapWildList::SetScope(unsigned s)
+void PokeGen::PokeMod::MapWildList::SetScope(const unsigned s)
 {
    LogSetVar("MapWildList", id, "scope", s);
    unsigned i = 0;
@@ -214,7 +212,7 @@ unsigned PokeGen::PokeMod::MapWildList::GetValue() const
    return value;
 }
 
-bool PokeGen::PokeMod::MapWildList::GetTime(unsigned ts) const
+bool PokeGen::PokeMod::MapWildList::GetTime(const unsigned ts) const
 {
    LogFetchVar("MapWildList", id, String("time[%u]", ts), "???");
    for (std::vector<unsigned>::iterator i = times.begin(); i != times.end(); ++i)
@@ -239,7 +237,7 @@ int PokeGen::PokeMod::MapWildList::GetScope() const
    return scope;
 }
 
-PokeGen::PokeMod::MapWildPokemon *PokeGen::PokeMod::MapWildList::GetMapWildPokemon(unsigned _id)
+PokeGen::PokeMod::MapWildPokemon *PokeGen::PokeMod::MapWildList::GetMapWildPokemon(const unsigned _id)
 {
    LogSubmoduleFetch("MapWildList", id, "Pokémon", _id);
    for (unsigned i = 0; i < GetMapWildPokemonCount(); ++i)
@@ -285,7 +283,7 @@ void PokeGen::PokeMod::MapWildList::NewMapWildPokemon(Ini *const ini)
    pokemon.push_back(newMapWildPokemon);
 }
 
-void PokeGen::PokeMod::MapWildList::DeleteMapWildPokemon(unsigned _id)
+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)