Fixed Logging, minor fixes, got rid of NatureEffect, and started migration from wxGTK to Qt

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@22 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 0 insertions, 94 deletions

diff --git a/pokemod/Status.cpp b/pokemod/Status.cpp
index 79b53f0b..0a90d1a0 100644
--- a/pokemod/Status.cpp
+++ b/pokemod/Status.cpp
@@ -125,100 +125,6 @@ void PokeGen::PokeMod::Status::Validate()
    LogValidateOver("Status", id, isValid, name);

 }

 

-#ifdef PG_DEBUG_WINDOW

-void PokeGen::PokeMod::Status::Validate(const wxListBox &output)

-{

-   LogValidateStart("Status", id, name);

-   if (name == "")

-   {

-      LogVarNotSet("Status", id, "Name", name);

-      output.Append(ConsoleLogVarNotSet("Status", id, "Name", name));

-      isValid = false;

-   }

-   else if (name == "Clear")

-   {

-      LogVarNotValid("Status", id, "name", name);

-      isValid = false;

-   }

-   if (abbreviation == "")

-   {

-      LogVarNotSet("Status", id, "abbreviation", name);

-      output.Append(ConsoleLogVarNotSetW("Status", id, "abbreviation", name));

-   }

-   else if (4 <= abbreviation.length())

-   {

-      LogVarNotValid("Status", id, "abbreviation", name);

-      output.Append(ConsoleLogVarNotValid("Status", id, "abbreviation", name));

-      isValid = false;

-   }

-   if (verb == "")

-   {

-      LogVarNotSet("Status", id, "verb", name);

-      output.Append(ConsoleLogVarNotSetW("Status", id, "verb", name));

-   }

-   if (afterSwitch == UINT_MAX)

-   {

-      LogVarNotSet("Status", id, "afterSwitch", name);

-      output.Append(ConsoleLogVarNotSetW("Status", id, "afterSwitch", name));

-   }

-   else if (!pokemod->GetStatus(afterSwitch))

-   {

-      LogVarNotValid("Status", id, "afterSwitch", name);

-      output.Append(ConsoleLogVarNotValid("Status", id, "afterSwitch", name));

-      isValid = false;

-   }

-   if (afterBattle == UINT_MAX)

-   {

-      LogVarNotSet("Status", id, "afterBattle", name);

-      output.Append(ConsoleLogVarNotSetW("Status", id, "afterBattle", name));

-   }

-   else if (!pokemod->GetStatus(afterBattle))

-   {

-      LogVarNotValid("Status", id, "afterBattle", name);

-      output.Append(ConsoleLogVarNotValid("Status", id, "afterBattle", name));

-      isValid = false;

-   }

-   if (GetStatusEffectCount())

-   {

-      std::map<unsigned, unsigned> idChecker;

-      std::map<String, unsigned> effectChecker;

-      for (std::vector<StatusEffect>::iterator i = effects.begin(); i != effects.end(); ++i)

-      {

-         LogSubmoduleIterate("Status", id, "effect", i->GetId(), name);

-         if (!i->IsValid())

-            isValid = false;

-         ++idChecker[i->GetId()];

-         ++effectChecker[i->GetEffectString()];

-      }

-      for (std::map<unsigned, unsigned>::const_iterator i = idChecker.begin(); i != idChecker.end(); ++i)

-      {

-         if (1 < i->second)

-         {

-            LogDuplicateId("Status", id, "effect", i->first, name);

-            output.Append(ConsoleLogDuplicateId("Status", id, "effect", i->first, name));

-            isValid = false;

-         }

-      }

-      for (std::map<String, unsigned>::const_iterator i = effectChecker.begin(); i != effectChecker.end(); ++i)

-      {

-         if (1 < i->second)

-         {

-            LogDuplicateSubmodule("Status", id, "effect", i->first, name);

-            output.Append(LogDuplicateSubmodule("Status", id, "effect", i->first, name));

-            isValid = false;

-         }

-      }

-   }

-   else

-   {

-      LogSubmoduleEmpty("Status", id, "effect", id, name);

-      output.Append(ConsoleLogSubmoduleEmpty("Status", id, "effect", name));

-      isValid = false;

-   }

-   LogValidateOver("Status", id, isValid, name);

-}

-#endif

-

 void PokeGen::PokeMod::Status::ImportIni(Ini &ini, const unsigned _id)

 {

    LogImportStart("Status");