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, 14 insertions, 14 deletions

diff --git a/pokemod/Status.cpp b/pokemod/Status.cpp
index b09de29a..79b53f0b 100644
--- a/pokemod/Status.cpp
+++ b/pokemod/Status.cpp
@@ -24,9 +24,7 @@
 

 #include "Status.h"

 

-extern PokeGen::PokeMod::Pokemod curPokeMod;

-

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

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

       name(""),

       abbreviation(""),

       verb(""),

@@ -37,11 +35,13 @@ PokeGen::PokeMod::Status::Status(const unsigned _id) :
 {

    LogCtor("Status", id);

    id = _id;

+   pokemod = par;

 }

 

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

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

 {

    LogCtorIni("Status", id);

+   pokemod = par;

    ImportIni(ini, _id);

    if (id == UINT_MAX)

       LogIdError("Status");

@@ -76,14 +76,14 @@ void PokeGen::PokeMod::Status::Validate()
       LogVarNotSet("Status", id, "verb", name);

    if (afterSwitch == UINT_MAX)

       LogVarNotSet("Status", id, "afterSwitch", name);

-   else if (!curPokeMod.GetStatus(afterSwitch))

+   else if (!pokemod->GetStatus(afterSwitch))

    {

       LogVarNotValid("Status", id, "afterSwitch", name);

       isValid = false;

    }

    if (afterBattle == UINT_MAX)

       LogVarNotSet("Status", id, "afterBattle", name);

-   else if (!curPokeMod.GetStatus(afterBattle))

+   else if (!pokemod->GetStatus(afterBattle))

    {

       LogVarNotValid("Status", id, "afterBattle", name);

       isValid = false;

@@ -161,7 +161,7 @@ void PokeGen::PokeMod::Status::Validate(const wxListBox &output)
       LogVarNotSet("Status", id, "afterSwitch", name);

       output.Append(ConsoleLogVarNotSetW("Status", id, "afterSwitch", name));

    }

-   else if (!curPokeMod.GetStatus(afterSwitch))

+   else if (!pokemod->GetStatus(afterSwitch))

    {

       LogVarNotValid("Status", id, "afterSwitch", name);

       output.Append(ConsoleLogVarNotValid("Status", id, "afterSwitch", name));

@@ -172,7 +172,7 @@ void PokeGen::PokeMod::Status::Validate(const wxListBox &output)
       LogVarNotSet("Status", id, "afterBattle", name);

       output.Append(ConsoleLogVarNotSetW("Status", id, "afterBattle", name));

    }

-   else if (!curPokeMod.GetStatus(afterBattle))

+   else if (!pokemod->GetStatus(afterBattle))

    {

       LogVarNotValid("Status", id, "afterBattle", name);

       output.Append(ConsoleLogVarNotValid("Status", id, "afterBattle", name));

@@ -281,7 +281,7 @@ void PokeGen::PokeMod::Status::SetVerb(const String &v)
 void PokeGen::PokeMod::Status::SetAfterSwitch(const unsigned a)

 {

    LogSetVar("Status", id, "afterSwitch", a, name);

-   if ((a == UINT_MAX) || curPokeMod.GetStatus(a))

+   if ((a == UINT_MAX) || pokemod->GetStatus(a))

       afterSwitch = a;

 }

 

@@ -290,14 +290,14 @@ void PokeGen::PokeMod::Status::SetAfterSwitch(const String &a)
    LogSetVar("Status", id, "afterSwitch string", a, name);

    if (a == "Clear")

       afterSwitch = UINT_MAX;

-   else if (const Status *s = curPokeMod.GetStatus(a))

+   else if (const Status *s = pokemod->GetStatus(a))

       afterSwitch = s->GetId();

 }

 

 void PokeGen::PokeMod::Status::SetAfterBattle(const unsigned a)

 {

    LogSetVar("Status", id, "afterBattle", a, name);

-   if ((a == UINT_MAX) || curPokeMod.GetStatus(a))

+   if ((a == UINT_MAX) || pokemod->GetStatus(a))

       afterBattle = a;

 }

 

@@ -306,7 +306,7 @@ void PokeGen::PokeMod::Status::SetAfterBattle(const String &a)
    LogSetVar("Status", id, "afterBattle string", a, name);

    if (a == "Clear")

       afterSwitch = UINT_MAX;

-   else if (const Status *s = curPokeMod.GetStatus(a))

+   else if (const Status *s = pokemod->GetStatus(a))

       afterBattle = s->GetId();

 }

 

@@ -349,7 +349,7 @@ unsigned PokeGen::PokeMod::Status::GetAfterSwitch() const
 PokeGen::PokeMod::String PokeGen::PokeMod::Status::GetAfterSwitchString() const

 {

    LogFetchVar("Status", id, "afterSwitch string", afterSwitch, name);

-   if (const Status *s = curPokeMod.GetStatus(afterSwitch))

+   if (const Status *s = pokemod->GetStatus(afterSwitch))

       return s->GetName();

    return "";

 }

@@ -363,7 +363,7 @@ unsigned PokeGen::PokeMod::Status::GetAfterBattle() const
 PokeGen::PokeMod::String PokeGen::PokeMod::Status::GetAfterBattleString() const

 {

    LogFetchVar("Status", id, "afterBattle string", afterBattle, name);

-   if (const Status *s = curPokeMod.GetStatus(afterBattle))

+   if (const Status *s = pokemod->GetStatus(afterBattle))

       return s->GetName();

    return "";

 }