1 files changed, 17 insertions, 17 deletions
diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp
index 5516e7e3..6c35a9f6 100644
--- a/pokemod/MapTrainer.cpp
+++ b/pokemod/MapTrainer.cpp
@@ -23,9 +23,7 @@
 
 #include "MapTrainer.h"
 
-extern PokeGen::PokeMod::Pokemod curPokeMod;
-
-PokeGen::PokeMod::MapTrainer::MapTrainer(const unsigned _id) :
+PokeGen::PokeMod::MapTrainer::MapTrainer(const Pokemod *par, const unsigned _id) :
       name(""),
       coordinate(0, 0),
       skin(""),
@@ -40,11 +38,13 @@ PokeGen::PokeMod::MapTrainer::MapTrainer(const unsigned _id) :
 {
    LogCtor("MapTrainer", _id);
    id = _id;
+   pokemod = par;
 }
 
-PokeGen::PokeMod::MapTrainer::MapTrainer(Ini &ini, const unsigned _id)
+PokeGen::PokeMod::MapTrainer::MapTrainer(const Pokemod *par, Ini &ini, const unsigned _id)
 {
    LogCtorIni("MapTrainer", _id);
+   pokemod = par;
    ImportIni(ini, _id);
    if (id == UINT_MAX)
       LogIdError("MapTrainer");
@@ -84,17 +84,17 @@ void PokeGen::PokeMod::MapTrainer::Validate()
          LogVarNotValid("MapTrainer", id, "ai", name);
       isValid = false;
    }
-   if (!curPokeMod.GetDialog(overworldDialog))
+   if (!pokemod->GetDialog(overworldDialog))
    {
       LogVarNotValid("MapTrainer", id, "overworldDialog", name);
       isValid = false;
    }
-   if (!curPokeMod.GetDialog(winDialog))
+   if (!pokemod->GetDialog(winDialog))
    {
       LogVarNotValid("MapTrainer", id, "winDialog", name);
       isValid = false;
    }
-   if (!curPokeMod.GetDialog(loseDialog))
+   if (!pokemod->GetDialog(loseDialog))
    {
       LogVarNotValid("MapTrainer", id, "loseDialog", name);
       isValid = false;
@@ -175,19 +175,19 @@ void PokeGen::PokeMod::MapTrainer::Validate(const wxListBox &output)
       }
       isValid = false;
    }
-   if (!curPokeMod.GetDialog(overworldDialog))
+   if (!pokemod->GetDialog(overworldDialog))
    {
       LogVarNotValid("MapTrainer", id, "overworldDialog", name);
       output.Append(ConsoleLogVarNotValid("MapTrainer", id, "overworldDialog", name));
       isValid = false;
    }
-   if (!curPokeMod.GetDialog(winDialog))
+   if (!pokemod->GetDialog(winDialog))
    {
       LogVarNotValid("MapTrainer", id, "winDialog", name);
       output.Append(ConsoleLogVarNotValid("MapTrainer", id, "winDialog", name));
       isValid = false;
    }
-   if (!curPokeMod.GetDialog(loseDialog))
+   if (!pokemod->GetDialog(loseDialog))
    {
       LogVarNotValid("MapTrainer", id, "loseDialog", name);
       output.Append(ConsoleLogVarNotValid("MapTrainer", id, "loseDialog", name));
@@ -378,14 +378,14 @@ void PokeGen::PokeMod::MapTrainer::SetAppearFlagStatus(const String &s)
 void PokeGen::PokeMod::MapTrainer::SetOverworldDialog(const unsigned o)
 {
    LogSetVar("MapTrainer", id, "overworldDialog", o, name);
-   if (curPokeMod.GetDialog(o))
+   if (pokemod->GetDialog(o))
       overworldDialog = o;
 }
 
 void PokeGen::PokeMod::MapTrainer::SetWinDialog(const unsigned w)
 {
    LogSetVar("MapTrainer", id, "winDialog", w, name);
-   if (curPokeMod.GetDialog(w))
+   if (pokemod->GetDialog(w))
       winDialog = w;
 }
 
@@ -478,7 +478,7 @@ unsigned PokeGen::PokeMod::MapTrainer::GetOverworldDialog() const
 PokeGen::PokeMod::String PokeGen::PokeMod::MapTrainer::GetOverworldDialogString() const
 {
    LogFetchVar("MapTrainer", id, "overworldDialog string", overworldDialog, name);
-   if (const Dialog *d = curPokeMod.GetDialog(overworldDialog))
+   if (const Dialog *d = pokemod->GetDialog(overworldDialog))
       return d->GetDialog();
    return "";
 }
@@ -492,7 +492,7 @@ unsigned PokeGen::PokeMod::MapTrainer::GetWinDialog() const
 PokeGen::PokeMod::String PokeGen::PokeMod::MapTrainer::GetWinDialogString() const
 {
    LogFetchVar("MapTrainer", id, "winDialog string", winDialog, name);
-   if (const Dialog *d = curPokeMod.GetDialog(winDialog))
+   if (const Dialog *d = pokemod->GetDialog(winDialog))
       return d->GetDialog();
    return "";
 }
@@ -506,7 +506,7 @@ unsigned PokeGen::PokeMod::MapTrainer::GetLoseDialog() const
 PokeGen::PokeMod::String PokeGen::PokeMod::MapTrainer::GetLoseDialogString() const
 {
    LogFetchVar("MapTrainer", id, "loseDialog string", loseDialog, name);
-   if (const Dialog *d = curPokeMod.GetDialog(loseDialog))
+   if (const Dialog *d = pokemod->GetDialog(loseDialog))
       return d->GetDialog();
    return "";
 }
@@ -522,7 +522,7 @@ PokeGen::PokeMod::String PokeGen::PokeMod::MapTrainer::GetLeadPokemonString() co
    LogFetchVar("MapTrainer", id, "leadPokemon string", leadPokemon, name);
    if (const MapTrainerTeam *s = GetMapTrainerTeam(leadPokemon))
    {
-      if (const Pokemon *p = curPokeMod.GetPokemon(s->GetSpecies()))
+      if (const Pokemon *p = pokemod->GetPokemon(s->GetSpecies()))
          return p->GetName();
    }
    return "";
@@ -554,7 +554,7 @@ void PokeGen::PokeMod::MapTrainer::NewMapTrainerTeam(Ini *const ini)
       if (!GetMapTrainerTeam(i))
          break;
    }
-   MapTrainerTeam newMapTrainerTeam(i);
+   MapTrainerTeam newMapTrainerTeam(pokemod, i);
    if (ini)
       newMapTrainerTeam.ImportIni(*ini);
    LogSubmoduleNew("MapTrainer", id, "team member", i, name);