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, 25 insertions, 27 deletions

diff --git a/pokemod/Tile.cpp b/pokemod/Tile.cpp
index 6465811f..7e3e7153 100644
--- a/pokemod/Tile.cpp
+++ b/pokemod/Tile.cpp
@@ -26,23 +26,23 @@
 extern PokeGen::PokeMod::Pokemod curPokeMod;

 

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

-   name(""),

-   pic(""),

-   fromUp(false),

-   fromDown(false),

-   fromLeft(false),

-   fromRight(false),

-   isWild(false),

-   wildChance(1, 1),

-   isWater(false),

-   waterType(UINT_MAX),

-   underWater(UINT_MAX),

-   canDive(false),

-   isCuttable(false),

-   underCut(UINT_MAX),

-   canHeadbutt(false),

-   forceType(UINT_MAX),

-   forceDirection(UINT_MAX)

+      name(""),

+      pic(""),

+      fromUp(false),

+      fromDown(false),

+      fromLeft(false),

+      fromRight(false),

+      isWild(false),

+      wildChance(1, 1),

+      isWater(false),

+      waterType(UINT_MAX),

+      underWater(UINT_MAX),

+      canDive(false),

+      isCuttable(false),

+      underCut(UINT_MAX),

+      canHeadbutt(false),

+      forceType(UINT_MAX),

+      forceDirection(UINT_MAX)

 {

    LogCtor("Tile", id);

    id = _id;

@@ -127,7 +127,7 @@ void PokeGen::PokeMod::Tile::Validate(const wxListBox &output)
    if (name == "")

    {

       LogVarNotSet("Tile", id, "Name", name);

-      output.append(ConsoleLogVarNotSet("Tile", id, "Name", name));

+      output.Append(ConsoleLogVarNotSet("Tile", id, "Name", name));

       isValid = false;

    }

    if (!pic.DoesExist())

@@ -135,12 +135,12 @@ void PokeGen::PokeMod::Tile::Validate(const wxListBox &output)
       if (pic == "")

       {

          LogVarNotSet("Tile", id, "pic", name);

-         output.append(ConsoleLogVarNotSet("Tile", id, "pic", name));

+         output.Append(ConsoleLogVarNotSet("Tile", id, "pic", name));

       }

       else

       {

          LogVarNotValid("Tile", id, "pic", name);

-         output.append(ConsoleLogVarNotValid("Tile", id, "pic", name));

+         output.Append(ConsoleLogVarNotValid("Tile", id, "pic", name));

       }

       isValid = false;

    }

@@ -149,7 +149,7 @@ void PokeGen::PokeMod::Tile::Validate(const wxListBox &output)
       if (WT_END <= waterType)

       {

          LogVarNotValid("Tile", id, "waterType", name);

-         output.append(Console);

+         output.Append(Console);

          isValid = false;

       }

       else if (waterType == WT_WHIRLPOOL)

@@ -157,7 +157,7 @@ void PokeGen::PokeMod::Tile::Validate(const wxListBox &output)
          if (!curPokeMod.GetTile(underWater))

          {

             LogVarNotValid("Tile", id, "underWater", name);

-            output.append(Console);

+            output.Append(Console);

             isValid = false;

          }

       }

@@ -167,7 +167,7 @@ void PokeGen::PokeMod::Tile::Validate(const wxListBox &output)
       if (!curPokeMod.GetTile(underCut))

       {

          LogVarNotValid("Tile", id, "underCut", name);

-         output.append(Console);

+         output.Append(Console);

          isValid = false;

       }

    }

@@ -178,7 +178,7 @@ void PokeGen::PokeMod::Tile::Validate(const wxListBox &output)
          if (DIR_END <= forceDirection)

          {

             LogVarNotValid("Tile", id, "forceDirection", name);

-            output.append(Console);

+            output.Append(Console);

             isValid = false;

          }

       }

@@ -186,7 +186,7 @@ void PokeGen::PokeMod::Tile::Validate(const wxListBox &output)
    else

    {

       LogVarNotValid("Tile", id, "forceType", name);

-      output.append(Console);

+      output.Append(Console);

       isValid = false;

    }

    LogValidateOver("Tile", id, isValid, name);

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

    }

@@ -232,7 +231,6 @@ void PokeGen::PokeMod::Tile::ImportIni(Ini &ini, const unsigned _id)
 void PokeGen::PokeMod::Tile::ExportIni(std::ofstream &fout) const

 {

    LogExportStart("Tile", id, name);

-   // Make elements

    Ini exTile("Tile");

    exTile.AddField("id", id);

    exTile.AddField("name", name);