Pokemod validation, paths made to default

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@20 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 5 insertions, 3 deletions

diff --git a/pokemod/Nature.cpp b/pokemod/Nature.cpp
index c6059ccb..519a9e1c 100644
--- a/pokemod/Nature.cpp
+++ b/pokemod/Nature.cpp
@@ -23,16 +23,18 @@
 

 #include "Nature.h"

 

-PokeGen::PokeMod::Nature::Nature(const unsigned _id) :

+PokeGen::PokeMod::Nature::Nature(const Pokemod *par, const unsigned _id) :

       name("")

 {

    LogCtor("Nature", _id);

    id = _id;

+   pokemod = par;

 }

 

-PokeGen::PokeMod::Nature::Nature(Ini &ini, const unsigned _id)

+PokeGen::PokeMod::Nature::Nature(const Pokemod *par, Ini &ini, const unsigned _id)

 {

    LogCtorIni("Nature", _id);

+   pokemod = par;

    ImportIni(ini, _id);

    if (id == UINT_MAX)

       LogIdError("Nature");

@@ -205,7 +207,7 @@ void PokeGen::PokeMod::Nature::NewNatureEffect(Ini *const ini)
       if (!GetNatureEffect(i))

          break;

    }

-   NatureEffect newNatureEffect(i);

+   NatureEffect newNatureEffect(pokemod, i);

    if (ini)

       newNatureEffect.ImportIni(*ini);

    LogSubmoduleNew("Nature", id, "effect", i, name);