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/StatusEffect.cpp b/pokemod/StatusEffect.cpp
index 2ecd5f66..c9b1f401 100644
--- a/pokemod/StatusEffect.cpp
+++ b/pokemod/StatusEffect.cpp
@@ -26,9 +26,9 @@
 extern PokeGen::PokeMod::Pokemod curPokeMod;

 

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

-   effect(UINT_MAX),

-   val1(UINT_MAX),

-   val2(UINT_MAX)

+      effect(UINT_MAX),

+      val1(UINT_MAX),

+      val2(UINT_MAX)

 {

    LogCtor("StatusEffect", _id);

    id = _id;

@@ -50,7 +50,8 @@ PokeGen::PokeMod::StatusEffect::~StatusEffect()
 void PokeGen::PokeMod::StatusEffect::Validate()

 {

    LogValidateStart("StatusEffect", id);

-   // TODO (Ben#1#): Validation

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

+#  warning "StatusEffect Validation"

    LogValidateOver("StatusEffect", id, isValid);

 }

 

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

    }

@@ -83,8 +83,7 @@ void PokeGen::PokeMod::StatusEffect::ImportIni(Ini &ini, const unsigned _id)
 void PokeGen::PokeMod::StatusEffect::ExportIni(std::ofstream &fout, const String &Status) const

 {

    LogExportStart("StatusEffect", id);

-   // Make elements

-   Ini exStatusEffect(Status + " StatusEffect");

+   Ini exStatusEffect("statusEffect " + status);

    exStatusEffect.AddField("id", id);

    exStatusEffect.AddField("effect", effect);

    exStatusEffect.AddField("val1", val1);