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, 3 insertions, 4 deletions

diff --git a/pokemod/Dialog.cpp b/pokemod/Dialog.cpp
index c7677cf1..23f09e1b 100644
--- a/pokemod/Dialog.cpp
+++ b/pokemod/Dialog.cpp
@@ -26,7 +26,7 @@
 extern PokeGen::PokeMod::Pokemod curPokeMod;

 

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

-   dialog("")

+      dialog("")

 {

    LogCtor("Dialog", _id);

    id = _id;

@@ -53,6 +53,7 @@ void PokeGen::PokeMod::Dialog::Validate()
 {

    LogValidateStart("Dialog", id);

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

+#  warning "Dialog Validation"

    LogValidateOver("Dialog", id, isValid);

 }

 

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

    }

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

 {

    LogExportStart("Dialog", id);

-   // Make elements

    Ini exDialog("dialog");

    exDialog.AddField("id", id);

    exDialog.AddField("dialog", dialog);

@@ -148,5 +147,5 @@ void PokeGen::PokeMod::Dialog::InsertDialogCommand(const unsigned cmd, const uns
 

 void PokeGen::PokeMod::Dialog::InsertDialogCommand(const String &cmd, const unsigned pos)

 {

-   // TODO (Ben#1#): Dialog commands

+   InsertDialogCommand(FindIn(DC_END, cmd, DialogCommandStr), pos);

 }