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/MapTrainerTeam.cpp b/pokemod/MapTrainerTeam.cpp
index bd7c59d6..6e61bee9 100644
--- a/pokemod/MapTrainerTeam.cpp
+++ b/pokemod/MapTrainerTeam.cpp
@@ -26,9 +26,9 @@
 extern PokeGen::PokeMod::Pokemod curPokeMod;

 

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

-   species(UINT_MAX),

-   level(1),

-   item(UINT_MAX)

+      species(UINT_MAX),

+      level(1),

+      item(UINT_MAX)

 {

    LogCtor("MapTrainerTeam", _id);

    id = _id;

@@ -100,7 +100,6 @@ void PokeGen::PokeMod::MapTrainerTeam::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("MapTrainerTeam");

    }

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

 {

    LogExportStart("MapTrainerTeam", id);

-   // Make elements

-   Ini exMapTrainerTeam(map + String(" %u MapTrainerTeam", trainerId));

+   Ini exMapTrainerTeam(String("MapTrainerTeam %u ", trainerId) + map);

    exMapTrainerTeam.AddField("id", id);

    exMapTrainerTeam.AddField("species", species);

    exMapTrainerTeam.AddField("level", level);