diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-02-12 17:19:54 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-02-12 17:19:54 -0500 |
| commit | 457170d68c2635a84d16c1ec04d7d90bc2be4fc9 (patch) | |
| tree | 780e1ff5b81fb39a7da3d1014f6ad9efa0420e2f | |
| parent | 9a52f25222f07d35806190d9d859efcc40fdd750 (diff) | |
TeamMember::id is now private and Q_SCRIPTABLE
| -rw-r--r-- | sigencore/TeamMember.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sigencore/TeamMember.h b/sigencore/TeamMember.h index 25c04f22..a7b1adbf 100644 --- a/sigencore/TeamMember.h +++ b/sigencore/TeamMember.h @@ -90,9 +90,9 @@ class SIGENCORE_EXPORT TeamMember : public Sigscript::Config TeamMember(const int speciesId, const QString& name, const int level, Containment* containment, const bool suppressItems = false); TeamMember(Sigscript::MapTrainerTeamMemberWrapper* teamMember, Containment* containment); - Containment* containment() const; + Q_SCRIPTABLE QUuid id() const; - QUuid id() const; + Containment* containment() const; QString name() const; long long currentHp() const; @@ -164,7 +164,6 @@ class SIGENCORE_EXPORT TeamMember : public Sigscript::Config Containment* m_containment; - const QUuid m_id; QString m_name; long long m_currentHp; @@ -196,6 +195,7 @@ class SIGENCORE_EXPORT TeamMember : public Sigscript::Config void initMoves(const QList<Sigscript::MoveWrapper*>& initial = QList<Sigscript::MoveWrapper*>()); void initNatures(const QList<Sigscript::NatureWrapper*>& initial = QList<Sigscript::NatureWrapper*>()); void initStats(); + const QUuid m_id; private slots: void levelGrown(); }; |