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/Nature.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pokemod/Nature.cpp') 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::iterator i = effects.begin(); i != effects.end(); ++i) + for (std::vector::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::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