[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, 5 insertions, 39 deletions

diff --git a/pokescripting/MapTrainerWrapper.h b/pokescripting/MapTrainerWrapper.h
index 1e558a04..8a3e061d 100644
--- a/pokescripting/MapTrainerWrapper.h
+++ b/pokescripting/MapTrainerWrapper.h
@@ -19,15 +19,17 @@
 #define __POKESCRIPTING_MAPTRAINERWRAPPER__
 
 // Pokescripting includes
-#include "MapTrainerTeamMemberWrapper.h"
 #include "ObjectWrapper.h"
-#include "TrainerWrapper.h"
 
 // Pokemod includes
 #include "../pokemod/MapTrainer.h"
 
 namespace Pokescripting
 {
+// Forward declarations
+class MapTrainerTeamMemberWrapper;
+class TrainerWrapper;
+
 class POKESCRIPTING_EXPORT MapTrainerWrapper : public ObjectWrapper
 {
     Q_OBJECT
@@ -44,6 +46,7 @@ class POKESCRIPTING_EXPORT MapTrainerWrapper : public ObjectWrapper
         TrainerWrapper* trainerClass();
         int numberFight() const;
         MapTrainerTeamMemberWrapper* leadTeamMember();
+        Pokemod::Script script() const;
         
         MapTrainerTeamMemberWrapper* teamMember(const int index);
         int teamMemberCount() const;
@@ -53,43 +56,6 @@ class POKESCRIPTING_EXPORT MapTrainerWrapper : public ObjectWrapper
         
         const Pokemod::MapTrainer* m_trainer;
 };
-
-inline MapTrainerWrapper::MapTrainerWrapper(const Pokemod::MapTrainer* trainer, QObject* parent) :
-        ObjectWrapper(trainer, parent),
-        m_trainer(trainer)
-{
-}
-
-inline QString MapTrainerWrapper::name() const
-{
-    return m_trainer->name();
-}
-
-inline TrainerWrapper* MapTrainerWrapper::trainerClass()
-{
-    return TrainerWrapper::create(pokemod()->trainerById(m_trainer->trainerClass()), this);
-}
-
-inline int MapTrainerWrapper::numberFight() const
-{
-    return m_trainer->numberFight();
-}
-
-inline MapTrainerTeamMemberWrapper* MapTrainerWrapper::leadTeamMember()
-{
-    return teamMember(m_trainer->leadTeamMember());
-}
-
-inline MapTrainerTeamMemberWrapper* MapTrainerWrapper::teamMember(const int index)
-{
-    return MapTrainerTeamMemberWrapper::create(m_trainer->teamMember(index), this);
-}
-
-inline int MapTrainerWrapper::teamMemberCount() const
-{
-    return m_trainer->teamMemberCount();
-}
-
 }
 
 #endif