From c1793a87ebea8c8e1bb2d5d1a409d105bfae3871 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 18 Aug 2008 18:51:31 +0000 Subject: [FIX] Script to make a tarball now defaults to HEAD for the revision [FIX] Enumeration types used to help remove some checks [FIX] Macro code moved to static members of Object (not all though) [FIX] Scripting wrappers now share information by keeping track of already-created instances of the wrapper [FIX] Scripting methods are now Q_SCRIPTABLE and not slots git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@239 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokescripting/RulesWrapper.h | 57 ++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 31 deletions(-) (limited to 'pokescripting/RulesWrapper.h') diff --git a/pokescripting/RulesWrapper.h b/pokescripting/RulesWrapper.h index db6d1afc..56af49a3 100644 --- a/pokescripting/RulesWrapper.h +++ b/pokescripting/RulesWrapper.h @@ -31,38 +31,33 @@ class POKESCRIPTING_EXPORT RulesWrapper : public ObjectWrapper Q_OBJECT public: - static RulesWrapper* create(const Pokemod::Rules* rules, QObject* parent) - { - if (!m_instances.contains(rules->id())) - m_instances[rules->id()] = new RulesWrapper(rules, parent); - return qobject_cast(m_instances[rules->id()]); - } - public slots: - bool genderAllowed() const; - bool breedingAllowed() const; - bool criticalDomains() const; - bool useTurns() const; - int numBoxes() const; - int boxSize() const; - int maxParty() const; - int maxFight() const; - int maxPlayers() const; - int maxHeldItems() const; - int maxAbilities() const; - int maxNatures() const; - int maxMoves() const; - int maxLevel() const; - int maxStages() const; - int maxMoney() const; - bool hardCash() const; - bool allowSwitchStyle() const; - bool specialSplit() const; - bool specialDVSplit() const; - bool effortValuesAllowed() const; - int maxTotalEV() const; - int maxEVPerStat() const; + static RulesWrapper* create(const Pokemod::Rules* rules, PokemodWrapper* parent); + + Q_SCRIPTABLE bool genderAllowed() const; + Q_SCRIPTABLE bool breedingAllowed() const; + Q_SCRIPTABLE bool criticalDomains() const; + Q_SCRIPTABLE bool useTurns() const; + Q_SCRIPTABLE int numBoxes() const; + Q_SCRIPTABLE int boxSize() const; + Q_SCRIPTABLE int maxParty() const; + Q_SCRIPTABLE int maxFight() const; + Q_SCRIPTABLE int maxPlayers() const; + Q_SCRIPTABLE int maxHeldItems() const; + Q_SCRIPTABLE int maxAbilities() const; + Q_SCRIPTABLE int maxNatures() const; + Q_SCRIPTABLE int maxMoves() const; + Q_SCRIPTABLE int maxLevel() const; + Q_SCRIPTABLE int maxStages() const; + Q_SCRIPTABLE int maxMoney() const; + Q_SCRIPTABLE bool hardCash() const; + Q_SCRIPTABLE bool allowSwitchStyle() const; + Q_SCRIPTABLE bool specialSplit() const; + Q_SCRIPTABLE bool specialDVSplit() const; + Q_SCRIPTABLE bool effortValuesAllowed() const; + Q_SCRIPTABLE int maxTotalEV() const; + Q_SCRIPTABLE int maxEVPerStat() const; private: - RulesWrapper(const Pokemod::Rules* rules, QObject* parent); + RulesWrapper(const Pokemod::Rules* rules, PokemodWrapper* parent); RulesWrapper& operator=(const RulesWrapper& rhs); const Pokemod::Rules* m_rules; -- cgit