Added Map and Tile, added Hat class, and fixed up some other minor things

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

1 files changed, 3 insertions, 5 deletions

diff --git a/pokemod/Nature.cpp b/pokemod/Nature.cpp
index 261ad56f..aa7df1e4 100644
--- a/pokemod/Nature.cpp
+++ b/pokemod/Nature.cpp
@@ -46,7 +46,6 @@ PokeGen::PokeMod::Nature::~Nature()
 

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

 {

-   isValid = true;

    LogValidateStart("Nature", id, name);

    if (name == "")

    {

@@ -73,7 +72,6 @@ void PokeGen::PokeMod::Nature::Validate()
 #ifdef PG_DEBUG_WINDOW

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

 {

-   isValid = true;

    LogValidateStart("Nature", id, name);

    if (name == "")

    {

@@ -124,7 +122,7 @@ void PokeGen::PokeMod::Nature::ExportIni(std::ofstream &fout) const
    Ini exNature("nature");

    exNature.AddField("name", name);

    exNature.Export(fout);

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

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

       i->ExportIni(fout, name);

    LogExportOver("Nature", id, name);

 }

@@ -141,7 +139,7 @@ PokeGen::PokeMod::String PokeGen::PokeMod::Nature::GetName() const
    return name;

 }

 

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

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

 {

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

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

@@ -178,7 +176,7 @@ void PokeGen::PokeMod::Nature::NewNatureEffect(Ini *const ini)
 void PokeGen::PokeMod::Nature::DeleteNatureEffect(const unsigned _id)

 {

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

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

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

    {

       if (i->GetId() == _id)

       {