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/Ability.cpp b/pokemod/Ability.cpp
index eba08c42..990eee0c 100644
--- a/pokemod/Ability.cpp
+++ b/pokemod/Ability.cpp
@@ -47,7 +47,6 @@ PokeGen::PokeMod::Ability::~Ability()
 

 void PokeGen::PokeMod::Ability::Validate()

 {

-   isValid = true;

    LogValidateStart("Ability", id, name);

    // Make sure the name is set to something

    if (name == "")

@@ -78,7 +77,6 @@ void PokeGen::PokeMod::Ability::Validate()
 #ifdef PG_DEBUG_WINDOW

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

 {

-   isValid = true;

    LogValidateStart("Ability", id, name);

    // Make sure the name is set to something

    if (name == "")

@@ -141,7 +139,7 @@ void PokeGen::PokeMod::Ability::ExportIni(std::ofstream &fout) const
 

 void PokeGen::PokeMod::Ability::SetName(const String &n)

 {

-   LogSetVar("Ability", id, "name", n, n);

+   LogSetVar("Ability", id, "name", n);

    name = n;

 }

 

@@ -151,7 +149,7 @@ PokeGen::PokeMod::String PokeGen::PokeMod::Ability::GetName() const
    return name;

 }

 

-PokeGen::PokeMod::AbilityEffect *PokeGen::PokeMod::Ability::GetAbilityEffect(const unsigned _id)

+const PokeGen::PokeMod::AbilityEffect *PokeGen::PokeMod::Ability::GetAbilityEffect(const unsigned _id) const

 {

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

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

@@ -188,7 +186,7 @@ void PokeGen::PokeMod::Ability::NewAbilityEffect(Ini *const ini)
 void PokeGen::PokeMod::Ability::DeleteAbilityEffect(const unsigned _id)

 {

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

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

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

    {

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

       {