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, 28 insertions, 4 deletions

diff --git a/pokemod/CoinList.cpp b/pokemod/CoinList.cpp
index e2919f8f..becd28f8 100644
--- a/pokemod/CoinList.cpp
+++ b/pokemod/CoinList.cpp
@@ -50,7 +50,6 @@ PokeGen::PokeMod::CoinList::~CoinList()
 

 void PokeGen::PokeMod::CoinList::Validate()

 {

-   isValid = true;

    LogValidateStart("CoinList", id, name);

    if (name == "")

    {

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

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

 {

-   isValid = true;

    LogValidateStart("CoinList", id, name);

    if (name == "")

    {

@@ -160,7 +158,7 @@ unsigned PokeGen::PokeMod::CoinList::GetValue() const
    return value;

 }

 

-PokeGen::PokeMod::CoinItem *PokeGen::PokeMod::CoinList::GetCoinItem(const unsigned _id)

+const PokeGen::PokeMod::CoinItem *PokeGen::PokeMod::CoinList::GetCoinItem(const unsigned _id) const

 {

    LogSubmoduleFetch("CoinList", id, "item", _id, name);

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

@@ -172,6 +170,18 @@ PokeGen::PokeMod::CoinItem *PokeGen::PokeMod::CoinList::GetCoinItem(const unsign
    return NULL;

 }

 

+const PokeGen::PokeMod::CoinItem *PokeGen::PokeMod::CoinList::GetCoinItem(const String &n) const

+{

+   LogSubmoduleFetch("CoinList", id, "item", n, name);

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

+   {

+      if (items[i].GetObjectString() == n)

+         return &items[i];

+   }

+   LogSubmoduleFetchFail("CoinList", id, "item", n, name);

+   return NULL;

+}

+

 unsigned PokeGen::PokeMod::CoinList::GetCoinItemCount() const

 {

    LogSubmoduleCount("CoinList", id, "items", name);

@@ -197,7 +207,7 @@ void PokeGen::PokeMod::CoinList::NewCoinItem(Ini *const ini)
 void PokeGen::PokeMod::CoinList::DeleteCoinItem(const unsigned _id)

 {

    LogSubmoduleRemoveStart("CoinList", id, "item", _id, name);

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

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

    {

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

       {

@@ -207,3 +217,17 @@ void PokeGen::PokeMod::CoinList::DeleteCoinItem(const unsigned _id)
    }

    LogSubmoduleRemoveFail("CoinList", id, "item", _id, name);

 }

+

+void PokeGen::PokeMod::CoinList::DeleteCoinItem(const String &n)

+{

+   LogSubmoduleRemoveStart("CoinList", id, "item", n, name);

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

+   {

+      if (i->GetObjectString() == n)

+      {

+         LogSubmoduleRemoved("CoinList", id, "item", n, name);

+         items.erase(i);

+      }

+   }

+   LogSubmoduleRemoveFail("CoinList", id, "item", n, name);

+}