Update PokeMod to PokeGen::PokeMod

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

1 files changed, 13 insertions, 13 deletions

diff --git a/pokemod/Nature.cpp b/pokemod/Nature.cpp
index 857ff427..128651ce 100644
--- a/pokemod/Nature.cpp
+++ b/pokemod/Nature.cpp
@@ -23,7 +23,7 @@
 

 #include "Nature.h"

 

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

+PokeGen::PokeMod::Nature::Nature(unsigned _id)

 {

    LogCtor("Nature", _id);

    name = "";

@@ -31,7 +31,7 @@ PokeMod::Nature::Nature(unsigned _id)
    id = _id;

 }

 

-PokeMod::Nature::Nature(XmlElement &xml, unsigned _id)

+PokeGen::PokeMod::Nature::Nature(XmlElement &xml, unsigned _id)

 {

    LogCtorXml("Nature", _id);

    ImportXml(xml, _id);

@@ -39,15 +39,15 @@ PokeMod::Nature::Nature(XmlElement &xml, unsigned _id)
       LogIdError("Nature");

 }

 

-PokeMod::Nature::~Nature()

+PokeGen::PokeMod::Nature::~Nature()

 {

    LogDtor("Nature", id, name);

 }

 

 #ifdef POKEMODR

-void PokeMod::Nature::Validate(wxListBox &output)

+void PokeGen::PokeMod::Nature::Validate(wxListBox &output)

 #else

-void PokeMod::Nature::Validate()

+void PokeGen::PokeMod::Nature::Validate()

 #endif

 {

    isValid = true;

@@ -80,7 +80,7 @@ void PokeMod::Nature::Validate()
    LogValidationOver("Nature", isValid, id, name);

 }

 

-void PokeMod::Nature::ImportXml(XmlElement &xml, unsigned _id)

+void PokeGen::PokeMod::Nature::ImportXml(XmlElement &xml, unsigned _id)

 {

    LogImport("Nature");

    String curName;

@@ -109,7 +109,7 @@ void PokeMod::Nature::ImportXml(XmlElement &xml, unsigned _id)
    LogImportOver("Nature");

 }

 

-PokeMod::XmlElement PokeMod::Nature::ExportXml()

+PokeGen::PokeMod::XmlElement PokeGen::PokeMod::Nature::ExportXml()

 {

    LogExportStart("Nature");

    XmlElement exNature("nature", id, true);

@@ -120,19 +120,19 @@ PokeMod::XmlElement PokeMod::Nature::ExportXml()
    return exNature;

 }

 

-void PokeMod::Nature::SetName(const String &n)

+void PokeGen::PokeMod::Nature::SetName(const String &n)

 {

    LogSetVar("Nature", "name", id, INT_MIN, n);

    name = n;

 }

 

-PokeMod::String PokeMod::Nature::GetName()

+PokeGen::PokeMod::String PokeGen::PokeMod::Nature::GetName()

 {

    LogFetchVar("Nature", "name", id, INT_MIN, name);

    return name;

 }

 

-PokeMod::NatureEffect *PokeMod::Nature::GetNatureEffect(unsigned _id)

+PokeGen::PokeMod::NatureEffect *PokeGen::PokeMod::Nature::GetNatureEffect(unsigned _id)

 {

    LogSubmoduleFetch("Nature", "effect", _id, id, name);

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

@@ -144,13 +144,13 @@ PokeMod::NatureEffect *PokeMod::Nature::GetNatureEffect(unsigned _id)
    return NULL;

 }

 

-unsigned PokeMod::Nature::GetNatureEffectCount()

+unsigned PokeGen::PokeMod::Nature::GetNatureEffectCount()

 {

    LogSubmoduleCount("Nature", "effects", id, name);

    return effects.size();

 }

 

-void PokeMod::Nature::NewNatureEffect()

+void PokeGen::PokeMod::Nature::NewNatureEffect()

 {

    unsigned i = 0;

    // Find the first unused ID in the vector

@@ -166,7 +166,7 @@ void PokeMod::Nature::NewNatureEffect()
    effects.push_back(newNatureEffect);

 }

 

-void PokeMod::Nature::DeleteNatureEffect(unsigned _id)

+void PokeGen::PokeMod::Nature::DeleteNatureEffect(unsigned _id)

 {

    LogSubmoduleRemoveStart("Nature", "effect", _id, id, name);

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