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, 24 insertions, 24 deletions

diff --git a/pokemod/MapWarp.cpp b/pokemod/MapWarp.cpp
index 3fbf3cf4..ee7e4e5f 100644
--- a/pokemod/MapWarp.cpp
+++ b/pokemod/MapWarp.cpp
@@ -26,20 +26,20 @@
 extern PokeGen::PokeMod::Pokemod curPokeMod;

 

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

-   name(""),

-   coordinate(0, 0),

-   fromUp(false),

-   fromDown(false),

-   fromLeft(false),

-   fromRight(false),

-   directionOut(UINT_MAX),

-   warpType(UINT_MAX),

-   isBiking(false),

-   isFlash(false),

-   toMap(UINT_MAX),

-   toWarp(UINT_MAX),

-   workingFlag(0, 0),

-   dialog(UINT_MAX)

+      name(""),

+      coordinate(0, 0),

+      fromUp(false),

+      fromDown(false),

+      fromLeft(false),

+      fromRight(false),

+      directionOut(UINT_MAX),

+      warpType(UINT_MAX),

+      isBiking(false),

+      isFlash(false),

+      toMap(UINT_MAX),

+      toWarp(UINT_MAX),

+      workingFlag(0, 0),

+      dialog(UINT_MAX)

 {

    LogCtor("MapWarp", _id);

    id = _id;

@@ -109,25 +109,25 @@ void PokeGen::PokeMod::MapWarp::Validate(const wxListBox &output)
    if (name == "")

    {

       LogVarNotSet("MapWarp", id, "name");

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

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

       isValid = false;

    }

    if (!fromUp && !fromDown && !fromLeft && !fromRight)

    {

       LogVarNotSet("MapWarp", id, "directions", name);

-      output.append(ConsoleLogVarNotSet("MapWarp", id, "directions", name));

+      output.Append(ConsoleLogVarNotSet("MapWarp", id, "directions", name));

       isValid = false;

    }

    if (DIR_END_NONE <= directionOut)

    {

       LogVarNotValid("MapWarp", id, "directionOut", name);

-      output.append(ConsoleLogVarNotValid("MapWarp", id, "directionOut", name));

+      output.Append(ConsoleLogVarNotValid("MapWarp", id, "directionOut", name));

       isValid = false;

    }

    if (WT_END <= warpType)

    {

       LogVarNotValid("MapWarp", id, "warpType", name);

-      output.append(ConsoleLogVarNotValid("MapWarp", id, "warpType", name));

+      output.Append(ConsoleLogVarNotValid("MapWarp", id, "warpType", name));

       isValid = false;

    }

    if (const Map *m = curPokeMod.GetMap(toMap))

@@ -135,20 +135,20 @@ void PokeGen::PokeMod::MapWarp::Validate(const wxListBox &output)
       if (!m->GetMapWarp(toWarp))

       {

          LogVarNotValid("MapWarp", id, "toWarp");

-         output.append(ConsoleLogVarNotValid("MapWarp", id, "toWarp"));

+         output.Append(ConsoleLogVarNotValid("MapWarp", id, "toWarp"));

          isValid = false;

       }

    }

    else

    {

       LogVarNotValid("MapWarp", id, "toMap");

-      output.append(ConsoleLogVarNotValid("MapWarp", id, "toMap"));

+      output.Append(ConsoleLogVarNotValid("MapWarp", id, "toMap"));

       isValid = false;

    }

    if (!curPokeMod.GetDialog(dialog))

    {

       LogVarNotValid("MapWarp", id, "dialog");

-      output.append(ConsoleLogVarNotValid("MapWarp", id, "dialog"));

+      output.Append(ConsoleLogVarNotValid("MapWarp", id, "dialog"));

       isValid = false;

    }

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

@@ -192,7 +192,7 @@ void PokeGen::PokeMod::MapWarp::ImportIni(Ini &ini, const unsigned _id)
 void PokeGen::PokeMod::MapWarp::ExportIni(std::ofstream &fout, const String &map) const

 {

    LogExportStart("MapWarp", id, name);

-   Ini exMapWarp(map + " mapWarp");

+   Ini exMapWarp("mapWarp " + map);

    exMapWarp.AddField("id", id);

    exMapWarp.AddField("coordinate-x", coordinate.GetX());

    exMapWarp.AddField("coordinate-y", coordinate.GetY());

@@ -318,8 +318,8 @@ void PokeGen::PokeMod::MapWarp::SetToMap(const String &t)
    LogSetVar("MapWarp", id, "toMap string", t, name);

    if (const Map *m = curPokeMod.GetMap(t))

    {

-     toMap = m->GetId();

-     toWarp = UINT_MAX;

+      toMap = m->GetId();

+      toWarp = UINT_MAX;

    }

 }