From f71140fae5218ee9839ffcd4ec83abfded5124f4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 1 Jun 2007 02:54:29 +0000 Subject: 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 --- pokemod/Item.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pokemod/Item.cpp') diff --git a/pokemod/Item.cpp b/pokemod/Item.cpp index 7e31aa7b..eeaf5fd1 100644 --- a/pokemod/Item.cpp +++ b/pokemod/Item.cpp @@ -52,7 +52,6 @@ PokeGen::PokeMod::Item::~Item() void PokeGen::PokeMod::Item::Validate() { - isValid = true; LogValidateStart("Item", id, name); if (name == "") { @@ -84,7 +83,6 @@ void PokeGen::PokeMod::Item::Validate() #ifdef PG_DEBUG_WINDOW void PokeGen::PokeMod::Item::Validate(const wxListBox &output) { - isValid = true; LogValidateStart("Item", id, name); if (name == "") { @@ -231,7 +229,7 @@ PokeGen::PokeMod::String PokeGen::PokeMod::Item::GetDescription() const return description; } -PokeGen::PokeMod::ItemEffect *PokeGen::PokeMod::Item::GetItemEffect(const unsigned _id) +const PokeGen::PokeMod::ItemEffect *PokeGen::PokeMod::Item::GetItemEffect(const unsigned _id) const { LogSubmoduleFetch("Item", id, "effect", _id, name); for (unsigned i = 0; i < GetItemEffectCount(); ++i) @@ -268,7 +266,7 @@ void PokeGen::PokeMod::Item::NewItemEffect(Ini *const ini) void PokeGen::PokeMod::Item::DeleteItemEffect(const unsigned _id) { LogSubmoduleRemoveStart("Item", id, "effect", _id, name); - for (std::vector::iterator i = effects.begin(); i != effects.end(); ++i) + for (std::vector::const_iterator i = effects.begin(); i != effects.end(); ++i) { if (i->GetId() == _id) { -- cgit