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, 19 insertions, 18 deletions

diff --git a/pokemod/MapEffect.cpp b/pokemod/MapEffect.cpp
index 35022b16..2735fd78 100644
--- a/pokemod/MapEffect.cpp
+++ b/pokemod/MapEffect.cpp
@@ -26,16 +26,16 @@
 extern PokeGen::PokeMod::Pokemod curPokeMod;

 

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

-   name(""),

-   coordinate(0, 0),

-   existFlag(0, 0),

-   skin(""),

-   effect(UINT_MAX),

-   val1(UINT_MAX),

-   val2(UINT_MAX),

-   direction(UINT_MAX),

-   isTransparent(false),

-   dialog(UINT_MAX)

+      name(""),

+      coordinate(0, 0),

+      existFlag(0, 0),

+      skin(""),

+      effect(UINT_MAX),

+      val1(UINT_MAX),

+      val2(UINT_MAX),

+      direction(UINT_MAX),

+      isTransparent(false),

+      dialog(UINT_MAX)

 {

    LogCtor("MapEffect", _id);

    id = _id;

@@ -57,14 +57,15 @@ PokeGen::PokeMod::MapEffect::~MapEffect()
 void PokeGen::PokeMod::MapEffect::Validate()

 {

    LogValidateStart("MapEffect", id, name);

-   // TODO (Ben#1#): MapEffect validation

+   // TODO (Validation#1#): MapEffect validation

+#  warning "MapEffect Validation"

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

 }

 

 #ifdef PG_DEBUG_WINDOW

 void PokeGen::PokeMod::MapEffect::Validate(const wxListBox &output)

 {

-   

+

 }

 #endif

 

@@ -205,7 +206,7 @@ void PokeGen::PokeMod::MapEffect::SetEffect(const String &e)
 void PokeGen::PokeMod::MapEffect::SetVal1(const unsigned v1)

 {

    LogSetVar("MapEffect", id, "val1", v1, name);

-   switch(effect)

+   switch (effect)

    {

       default:

          LogNotSet("MapEffect", id, "val1", v1, "effect");

@@ -215,7 +216,7 @@ void PokeGen::PokeMod::MapEffect::SetVal1(const unsigned v1)
 void PokeGen::PokeMod::MapEffect::SetVal2(const unsigned v2)

 {

    LogSetVar("MapEffect", id, "val2", v2, name);

-   switch(effect)

+   switch (effect)

    {

       default:

          LogNotSet("MapEffect", id, "val2", v2, "effect");

@@ -224,7 +225,7 @@ void PokeGen::PokeMod::MapEffect::SetVal2(const unsigned v2)
 

 void PokeGen::PokeMod::MapEffect::SetVal2(const String &v2)

 {

-   switch(effect)

+   switch (effect)

    {

       default:

          LogNotSet("MapEffect", id, "val2", v2, "effect");

@@ -253,7 +254,7 @@ void PokeGen::PokeMod::MapEffect::SetDialog(const unsigned d)
 {

    LogSetVar("MapEffect", id, "dialog", d, name);

    if (curPokeMod.GetDialog(d))

-     dialog = d;

+      dialog = d;

 }

 

 PokeGen::PokeMod::String PokeGen::PokeMod::MapEffect::GetName() const

@@ -340,9 +341,9 @@ PokeGen::PokeMod::String PokeGen::PokeMod::MapEffect::GetVal2String() const
 {

    LogFetchVar("MapEffect", id, "val2 string", val2, name);

    String ret = "";

-   switch(effect)

+   switch (effect)

    {

-      // TODO (Ben#1#): Effect code

+         // TODO (Ben#1#): Effect code

    }

    return ret;

 }