Style cleanup, minor Matrix fixes, duplication validations, Pokemod methods

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@19 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 4 insertions, 6 deletions

diff --git a/pokemod/MapWildPokemon.cpp b/pokemod/MapWildPokemon.cpp
index 07a4dee3..cc42f3b4 100644
--- a/pokemod/MapWildPokemon.cpp
+++ b/pokemod/MapWildPokemon.cpp
@@ -26,9 +26,9 @@
 extern PokeGen::PokeMod::Pokemod curPokeMod;

 

 PokeGen::PokeMod::MapWildPokemon::MapWildPokemon(const unsigned _id) :

-   pokemon(UINT_MAX),

-   level(1),

-   weight(1)

+      pokemon(UINT_MAX),

+      level(1),

+      weight(1)

 {

    LogCtor("MapWildPokemon", _id);

    id = _id;

@@ -100,7 +100,6 @@ void PokeGen::PokeMod::MapWildPokemon::ImportIni(Ini &ini, const unsigned _id)
    if (_id == UINT_MAX)

    {

       ini.GetValue("id", id);

-      // Was there an id associated with the element?

       if (id == UINT_MAX)

          LogIdNotFound("MapWildPokemon");

    }

@@ -115,8 +114,7 @@ void PokeGen::PokeMod::MapWildPokemon::ImportIni(Ini &ini, const unsigned _id)
 void PokeGen::PokeMod::MapWildPokemon::ExportIni(std::ofstream &fout, const String &map, const unsigned listId) const

 {

    LogExportStart("MapWildPokemon", id);

-   // Make elements

-   Ini exMapWildPokemon(map + String(" %u mapWildPokemon", listId));

+   Ini exMapWildPokemon(String("mapWildPokemon %u ", listId) + map);

    exMapWildPokemon.AddField("id", id);

    exMapWildPokemon.AddField("pokemon", pokemon);

    exMapWildPokemon.AddField("level", level);