diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-04-17 23:34:36 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-04-17 23:34:36 +0000 |
| commit | 6679f5cffa9d35a23b76605ddfbf3257f882b6ee (patch) | |
| tree | c8e41854a60b64e8569939bca6b827807175ef9a /pokemod/AbilityEffect.h | |
| parent | 05980e883719b1c8ebde1bd2fcbf4f8c16df7ad6 (diff) | |
| download | sigen-6679f5cffa9d35a23b76605ddfbf3257f882b6ee.tar.gz sigen-6679f5cffa9d35a23b76605ddfbf3257f882b6ee.tar.xz sigen-6679f5cffa9d35a23b76605ddfbf3257f882b6ee.zip | |
[FIX] Frac -> Fraction
[FIX] ImageCache and Ini removed
[FIX] Fraction/Point widgets moved to pokemodr
[FIX] Copy ctors made for pokemod classes
[FIX] Ctors in pokemod fixed
[FIX] Copyright headers fixed in pokemodr
[FIX] PokeModr updated to new API and fixed in some places
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@99 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/AbilityEffect.h')
| -rw-r--r-- | pokemod/AbilityEffect.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/pokemod/AbilityEffect.h b/pokemod/AbilityEffect.h index 2fd688f5..516c3958 100644 --- a/pokemod/AbilityEffect.h +++ b/pokemod/AbilityEffect.h @@ -24,7 +24,7 @@ // General includes #include <Exception.h> -#include <Frac.h> +#include <Fraction.h> // Pokemod includes #include "Object.h" @@ -120,30 +120,31 @@ class AbilityEffect : public Object }; static const QStringList SideStr; + AbilityEffect(const AbilityEffect& effect); AbilityEffect(const Pokemod* pokemod, const int id); - AbilityEffect(const Pokemod* pokemod, const AbilityEffect& effect, const int id); - AbilityEffect(const Pokemod* pokemod, const QDomElement& xml, const int id = INT_MAX); + AbilityEffect(const AbilityEffect& effect, const Pokemod* pokemod, const int id); + AbilityEffect(const QDomElement& xml, const Pokemod* pokemod, const int id = INT_MAX); void load(const QDomElement& xml, int id = INT_MAX); QDomElement save() const; - void setChance(const Frac& chance) throw(Exception); + void setChance(const Fraction& chance) throw(Exception); void setEffect(const int effect) throw(BoundsException); void setValue1(const int value1) throw(Exception); void setValue2(const int value2) throw(Exception); void setValue3(const int value3) throw(Exception); void setTrigger(const int trigger) throw(BoundsException); void setTriggerValue1(const int triggerValue1) throw(Exception); - void setTriggerValue2(const Frac& triggerValue2) throw(Exception); + void setTriggerValue2(const Fraction& triggerValue2) throw(Exception); - Frac chance() const; + Fraction chance() const; int effect() const; int value1() const; int value2() const; int value3() const; int trigger() const; int triggerValue1() const; - Frac triggerValue2() const; + Fraction triggerValue2() const; AbilityEffect& operator=(const AbilityEffect& rhs); private: @@ -152,14 +153,14 @@ class AbilityEffect : public Object { } - Frac m_chance; + Fraction m_chance; int m_effect; int m_value1; int m_value2; int m_value3; int m_trigger; int m_triggerValue1; - Frac m_triggerValue2; + Fraction m_triggerValue2; }; #endif |