1 files changed, 14 insertions, 14 deletions
diff --git a/pokemod/MoveEffect.cpp b/pokemod/MoveEffect.cpp
index f7c5835a..e790d672 100644
--- a/pokemod/MoveEffect.cpp
+++ b/pokemod/MoveEffect.cpp
@@ -15,22 +15,22 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Pokemod includes
-#include "Pokemod.h"
-
 // Header include
 #include "MoveEffect.h"
 
+// Pokemod includes
+#include "Pokemod.h"
+
 const QStringList MoveEffect::EffectStr = QStringList() << "Damage" << "Status" << "Confuse" << "Stat" << "StealHP" << "Counter" << "Selfdestruct" << "Need Status" << "Mirror" << "GetMoney" << "Never Miss" << "Steal Types" << "Clear Effects" << "Wait And Return" << "Self Confuse" << "Force Switch" << "Hit Multiple" << "Hit Multiple Turns" << "Flinch" << "One Hit K.O." << "Recoil" << "Recover" << "Rest" << "Sheild" << "Substitute" << "Recharge" << "Rage" << "Mimic" << "Random Move" << "Seed" << "Disable" << "Cut HM" << "Fly HM" << "Surf HM" << "Strength HM" << "Flash HM" << "Rock Smash HM" << "Rock Climb HM" << "Whirlpool HM" << "Waterfall HM" << "Share HP HM " << "Escape HM";
 
 MoveEffect::MoveEffect(const MoveEffect& effect) :
-        Object("MoveEffect", effect.pokemod(), effect.id())
+        Object("MoveEffect", effect.parent(), effect.id())
 {
     *this = effect;
 }
 
-MoveEffect::MoveEffect(const Pokemod* pokemod, const int id) :
-        Object("MoveEffect", pokemod, id),
+MoveEffect::MoveEffect(const Object* parent, const int id) :
+        Object("MoveEffect", parent, id),
         m_chance(1, 1),
         m_effect(INT_MAX),
         m_value1(INT_MAX),
@@ -40,24 +40,24 @@ MoveEffect::MoveEffect(const Pokemod* pokemod, const int id) :
 {
 }
 
-MoveEffect::MoveEffect(const MoveEffect& effect, const Pokemod* pokemod, const int id) :
-        Object("MoveEffect", pokemod, id)
+MoveEffect::MoveEffect(const MoveEffect& effect, const Object* parent, const int id) :
+        Object("MoveEffect", parent, id)
 {
     *this = effect;
 }
 
-MoveEffect::MoveEffect(const QDomElement& xml, const Pokemod* pokemod, const int id) :
-        Object("MoveEffect", pokemod, id)
+MoveEffect::MoveEffect(const QDomElement& xml, const Object* parent, const int id) :
+        Object("MoveEffect", parent, id)
 {
     load(xml, id);
 }
 
 bool MoveEffect::validate() const
 {
-    bool valid = true;
-    pokemod()->validationMsg(QString("------Effect with id %1---").arg(id()), Pokemod::V_Msg);
-    // TODO: Move Effect validation
-    return valid;
+    // TODO: validate
+//     bool valid = true;
+//     static_cast<const Pokemod*>(pokemod())->validationMsg(QString("------Effect with id %1---").arg(id()), Pokemod::V_Msg);
+//     return valid;
 }
 
 void MoveEffect::load(const QDomElement& xml, int id)