diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-02-12 19:57:05 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-02-12 19:57:05 -0500 |
| commit | e48659ea5febc07ecedc37a0cc34c42197e05ebc (patch) | |
| tree | 5ee3d3b5249926ad57afd6b2e01c1765f5785ddd | |
| parent | 83707045585323590ef68d7d091e04fe9a45b7d2 (diff) | |
| download | sigen-e48659ea5febc07ecedc37a0cc34c42197e05ebc.tar.gz sigen-e48659ea5febc07ecedc37a0cc34c42197e05ebc.tar.xz sigen-e48659ea5febc07ecedc37a0cc34c42197e05ebc.zip | |
Fixes for the build
| -rw-r--r-- | sigencore/TeamMember.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sigencore/TeamMember.cpp b/sigencore/TeamMember.cpp index 57afecf2..a54f7d20 100644 --- a/sigencore/TeamMember.cpp +++ b/sigencore/TeamMember.cpp @@ -23,6 +23,7 @@ #include "Containment.h" #include "Player.h" #include "RunScript.h" +#include "Team.h" // Sigscript includes #include "../sigscript/AbilityWrapper.h" @@ -35,6 +36,7 @@ #include "../sigscript/StatusWrapper.h" #include "../sigscript/SpeciesWrapper.h" #include "../sigscript/SpeciesMoveWrapper.h" +#include "../sigscript/StatusWrapper.h" // Sigcore includes #include "../sigcore/Hat.h" @@ -82,7 +84,6 @@ int Sigencore::actionPriority(TeamMember* teamMember, const TeamMember::Action& { bool ok; ObjectMap objects; - objects["arena"] = teamMember->arena(); objects["owner"] = teamMember; objects["sigmod"] = teamMember->sigmod(); Kross::Action* kaction = globalScript(teamMember->sigmod(), QString("battleaction-priority-%1").arg(action.first), QUuid::createUuid().toString(), objects, Kross::Manager::self().actionCollection()); @@ -232,6 +233,7 @@ bool Sigencore::TeamMember::setLevel(const int level) return false; if ((level <= 0) || (m_sigmod->rules()->maxLevel() < level)) return false; + // TODO: Update stats m_level = level; m_levelExp = calcLevelExperience(m_species->growth(), m_level); emit(levelChanged(level)); @@ -262,6 +264,7 @@ bool Sigencore::TeamMember::setLevelExperience(const long long levelExp) { m_level = level; emit(levelChanged(level)); + // TODO: Update stats } emit(levelExperienceChanged(m_levelExp)); return true; @@ -407,8 +410,7 @@ void Sigencore::TeamMember::makeActive(Arena* arena) { // TODO Team* team = qobject_cast<Team*>(this->containment()); - QList<Sigscript::StatusWrapper*> statuses = m_status.keys(); - foreach (Sigscript::StatusWrapper* status, statuses) + foreach (Sigscript::StatusWrapper* status, m_status) { const Sigcore::Script script = status->battleScript(); if (!script.script().isEmpty()) @@ -424,8 +426,7 @@ void Sigencore::TeamMember::makeActive(Arena* arena) m_statusBattleScripts.append(action); } } - QList<Sigscript::AbilityWrapper*> abilities = m_abilities.keys(); - foreach (Sigscript::AbilityWrapper* ability, abilities) + foreach (Sigscript::AbilityWrapper* ability, m_abilities) { const Sigcore::Script script = ability->battleScript(); if (!script.script().isEmpty()) |