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

diff --git a/pokemod/PokemonAbility.cpp b/pokemod/PokemonAbility.cpp
index 1fbd75c9..0189da63 100644
--- a/pokemod/PokemonAbility.cpp
+++ b/pokemod/PokemonAbility.cpp
@@ -28,7 +28,7 @@ extern PokeGen::PokeMod::Pokemod curPokeMod;
 PokeGen::PokeMod::PokemonAbility::PokemonAbility(const unsigned _id)

 {

    LogCtor("PokemonAbility", _id);

-   ability = -1;

+   ability = UINT_MAX;

    weight = 1;

    id = _id;

 }

@@ -48,7 +48,6 @@ PokeGen::PokeMod::PokemonAbility::~PokemonAbility()
 

 void PokeGen::PokeMod::PokemonAbility::Validate()

 {

-   isValid = true;

    LogValidateStart("PokemonAbility", id);

    if (!curPokeMod.GetAbility(ability))

    {

@@ -66,7 +65,6 @@ void PokeGen::PokeMod::PokemonAbility::Validate()
 #ifdef PG_DEBUG_WINDOW

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

 {

-   isValid = true;

    LogValidateStart("PokemonAbility", id);

    if (!curPokeMod.GetAbility(ability))

    {

@@ -96,7 +94,7 @@ void PokeGen::PokeMod::PokemonAbility::ImportIni(Ini &ini, const unsigned _id)
    }

    else

       id = _id;

-   ini.GetValue("ability", ability, -1);

+   ini.GetValue("ability", ability);

    ini.GetValue("weight", weight, 1);

    LogImportOver("PokemonAbility", id);

 }

@@ -113,10 +111,11 @@ void PokeGen::PokeMod::PokemonAbility::ExportIni(std::ofstream &fout, const Stri
    LogExportOver("PokemonAbility", id);

 }

 

-void PokeGen::PokeMod::PokemonAbility::SetAbility(const int a)

+void PokeGen::PokeMod::PokemonAbility::SetAbility(const unsigned a)

 {

    LogSetVar("PokemonAbility", id, "ability", a);

-   ability = a;

+   if (curPokeMod.GetAbility(a))

+      ability = a;

 }

 

 void PokeGen::PokeMod::PokemonAbility::SetAbility(const String &a)

@@ -133,7 +132,7 @@ void PokeGen::PokeMod::PokemonAbility::SetWeight(const unsigned w)
       weight = w;

 }

 

-int PokeGen::PokeMod::PokemonAbility::GetAbility() const

+unsigned PokeGen::PokeMod::PokemonAbility::GetAbility() const

 {

    LogFetchVar("PokemonAbility", id, "ability", ability);

    return ability;