From f80268eb885e28c603cc88523cfce2751d1448e1 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 7 Sep 2008 18:49:29 +0000 Subject: [FIX] Added a static poll method to Fraction [FIX] More Arena stuff fleshed out [FIX] Added priority scripts to Ability and Move [FIX] A SigmodWrapper pointer is now passed around the containments [FIX] Config now has templated methods for retrieving values git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@253 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- sigmod/Move.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'sigmod/Move.cpp') diff --git a/sigmod/Move.cpp b/sigmod/Move.cpp index 39cfef65..75e8efbd 100644 --- a/sigmod/Move.cpp +++ b/sigmod/Move.cpp @@ -42,7 +42,8 @@ Sigmod::Move::Move(const Sigmod* parent, const int id) : m_priority(0), m_description(""), m_battleScript("", ""), - m_worldScript("", "") + m_worldScript("", ""), + m_priorityScript("", "") { } @@ -88,6 +89,7 @@ void Sigmod::Move::load(const QDomElement& xml) LOAD(description); LOAD(battleScript); LOAD(worldScript); + LOAD(priorityScript); } QDomElement Sigmod::Move::save() const @@ -103,6 +105,7 @@ QDomElement Sigmod::Move::save() const SAVE(description); SAVE(battleScript); SAVE(worldScript); + SAVE(priorityScript); return xml; } @@ -165,6 +168,11 @@ void Sigmod::Move::setWorldScript(const Script& worldScript) CHECK(worldScript); } +void Sigmod::Move::setPriorityScript(const Script& priorityScript) +{ + CHECK(priorityScript); +} + QString Sigmod::Move::name() const { return m_name; @@ -215,6 +223,11 @@ Sigmod::Script Sigmod::Move::worldScript() const return m_worldScript; } +Sigmod::Script Sigmod::Move::priorityScript() const +{ + return m_priorityScript; +} + Sigmod::Move& Sigmod::Move::operator=(const Move& rhs) { if (this == &rhs) @@ -229,5 +242,6 @@ Sigmod::Move& Sigmod::Move::operator=(const Move& rhs) COPY(description); COPY(battleScript); COPY(worldScript); + COPY(priorityScript); return *this; } -- cgit