diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-10-06 00:50:02 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-10-06 00:50:02 +0000 |
| commit | 2c0a3866e09140d8d5ff84178decddc22db15778 (patch) | |
| tree | 8d780290c2b1738cb17cec832dd866b068b9a31f /sigbattle | |
| parent | 61276d172306a14c110a7c3631b484ccf93f9ffa (diff) | |
| download | sigen-2c0a3866e09140d8d5ff84178decddc22db15778.tar.gz sigen-2c0a3866e09140d8d5ff84178decddc22db15778.tar.xz sigen-2c0a3866e09140d8d5ff84178decddc22db15778.zip | |
[FIX] Added single player option to Sigmod
[FIX] Doxygen generation cleaned up
[FIX] Can no longer override variables in the Sigmod if not a single player game
[FIX] When checking for modified move priority, blean up afterwards
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@271 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'sigbattle')
| -rw-r--r-- | sigbattle/TeamMember.cpp | 15 | ||||
| -rw-r--r-- | sigbattle/TeamMember.h | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/sigbattle/TeamMember.cpp b/sigbattle/TeamMember.cpp index b0742380..c7ce437a 100644 --- a/sigbattle/TeamMember.cpp +++ b/sigbattle/TeamMember.cpp @@ -51,16 +51,23 @@ // C includes #include <cmath> -int Sigbattle::actionPriority(const TeamMember* teamMember, const TeamMember::Action& action) +int Sigbattle::actionPriority(TeamMember* teamMember, const TeamMember::Action& action) { int priority = INT_MAX; switch (action.first) { case TeamMember::Attack: - if (teamMember->hasValueOfType<int>("priority")) - - priority = teamMember->sigmod()->move(action.second.first.toString())->priority(); + { + QString move = action.second.first.toString(); + if (teamMember->hasValueOfType<int>(QString("move-priority-%1").arg(move))) + { + priority = teamMember->valueOfType<int>(QString("move-priority-%1").arg(move)); + teamMember->removeValue(QString("move-priority-%1").arg(move)); + } + else + priority = teamMember->sigmod()->move(move)->priority(); break; + } case TeamMember::Item: priority = INT_MIN / 3; break; diff --git a/sigbattle/TeamMember.h b/sigbattle/TeamMember.h index 2104bc2f..674f8e30 100644 --- a/sigbattle/TeamMember.h +++ b/sigbattle/TeamMember.h @@ -206,7 +206,7 @@ class SIGBATTLE_EXPORT TeamMember : public Sigscript::Config void initStats(); }; -int actionPriority(const TeamMember* teamMember, const TeamMember::Action& action); +int actionPriority(TeamMember* teamMember, const TeamMember::Action& action); } Q_DECLARE_METATYPE(Sigbattle::TeamMember*) |