[FIX] List members of pokemod classes now can be returned in their entirety

[FIX] Reworked pokescripting for ease of use
[FIX] Now (selected) pokemod values can be overridden in pokescripting

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

1 files changed, 3 insertions, 33 deletions

diff --git a/pokescripting/BadgeWrapper.h b/pokescripting/BadgeWrapper.h
index b1f018cb..fa518e7a 100644
--- a/pokescripting/BadgeWrapper.h
+++ b/pokescripting/BadgeWrapper.h
@@ -20,13 +20,15 @@
 
 // Pokescripting includes
 #include "ObjectWrapper.h"
-#include "SpriteWrapper.h"
 
 // Pokemod includes
 #include "../pokemod/Badge.h"
 
 namespace Pokescripting
 {
+// Forward declarations
+class SpriteWrapper;
+
 class POKESCRIPTING_EXPORT BadgeWrapper : public ObjectWrapper
 {
     Q_OBJECT
@@ -50,38 +52,6 @@ class POKESCRIPTING_EXPORT BadgeWrapper : public ObjectWrapper
         
         const Pokemod::Badge* m_badge;
 };
-
-inline BadgeWrapper::BadgeWrapper(const Pokemod::Badge* badge, QObject* parent) :
-        ObjectWrapper(badge, parent),
-        m_badge(badge)
-{
-}
-
-inline QString BadgeWrapper::name() const
-{
-    return m_badge->name();
-}
-
-inline Pokescripting::SpriteWrapper* BadgeWrapper::face()
-{
-    return SpriteWrapper::create(pokemod()->spriteById(m_badge->face()), this);
-}
-
-inline Pokescripting::SpriteWrapper* BadgeWrapper::badge()
-{
-    return SpriteWrapper::create(pokemod()->spriteById(m_badge->badge()), this);
-}
-
-inline int BadgeWrapper::obey() const
-{
-    return m_badge->obey();
-}
-
-inline Pokemod::Fraction BadgeWrapper::stat(const int stat) const
-{
-    return m_badge->stat(stat);
-}
-
 }
 
 #endif