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

diff --git a/pokemod/MoveEffect.cpp b/pokemod/MoveEffect.cpp
index fc05511d..88926348 100644
--- a/pokemod/MoveEffect.cpp
+++ b/pokemod/MoveEffect.cpp
@@ -25,13 +25,13 @@
 

 extern PokeGen::PokeMod::Pokemod curPokeMod;

 

-PokeGen::PokeMod::MoveEffect::MoveEffect(const unsigned _id)

+PokeGen::PokeMod::MoveEffect::MoveEffect(const unsigned _id) :

+      chance(1, 1),

+      effect(UINT_MAX),

+      val1(INT_MAX),

+      val2(UINT_MAX)

 {

    LogCtor("MoveEffect", _id);

-   chance.Set(1, 1);

-   effect = UINT_MAX;

-   val1 = INT_MAX;

-   val2 = UINT_MAX;

    id = _id;

 }

 

@@ -56,6 +56,7 @@ void PokeGen::PokeMod::MoveEffect::Validate()
 {

    LogValidateStart("MoveEffect", id);

    // TODO (Validation#1#): MoveEffect Validation

+#  warning "MoveEffect Validation"

    LogValidateOver("MoveEffect", id, isValid);

 }

 

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

    }

@@ -84,7 +84,6 @@ void PokeGen::PokeMod::MoveEffect::ImportIni(Ini &ini, const unsigned _id)
 void PokeGen::PokeMod::MoveEffect::ExportIni(std::ofstream &fout, const String &move) const

 {

    LogExportStart("MoveEffect", id);

-   // Make elements

    Ini exMoveEffect(move + " moveEffect");

    exMoveEffect.AddField("id", id);

    exMoveEffect.AddField("chance-n", chance.GetNum());