diff options
author | Ben Boeckel <MathStuf@gmail.com> | 2009-02-24 16:18:17 -0500 |
---|---|---|
committer | Ben Boeckel <MathStuf@gmail.com> | 2009-02-24 16:18:17 -0500 |
commit | b28b0cb3d52336f77b7ad8b313b3d6fd6b7d0e67 (patch) | |
tree | 01971661209ccb6d6844a096a5ea3d39baeabe68 /sigscript | |
parent | b6d07f0ca14256a42268e69190891c56bf978bd4 (diff) | |
download | sigen-b28b0cb3d52336f77b7ad8b313b3d6fd6b7d0e67.tar.gz sigen-b28b0cb3d52336f77b7ad8b313b3d6fd6b7d0e67.tar.xz sigen-b28b0cb3d52336f77b7ad8b313b3d6fd6b7d0e67.zip |
Moved SigmodWrapper to GameWrapper
Diffstat (limited to 'sigscript')
60 files changed, 166 insertions, 166 deletions
diff --git a/sigscript/AbilityWrapper.cpp b/sigscript/AbilityWrapper.cpp index 65b69661..c1132207 100644 --- a/sigscript/AbilityWrapper.cpp +++ b/sigscript/AbilityWrapper.cpp @@ -19,12 +19,12 @@ #include "AbilityWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Ability.h> -Sigscript::AbilityWrapper* Sigscript::AbilityWrapper::create(const Sigmod::Ability* ability, SigmodWrapper* parent) +Sigscript::AbilityWrapper* Sigscript::AbilityWrapper::create(const Sigmod::Ability* ability, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(ability->className(), ability->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::AbilityWrapper* Sigscript::AbilityWrapper::create(const Sigmod::Abili return qobject_cast<AbilityWrapper*>(m_instances[sig]); } -Sigscript::AbilityWrapper::AbilityWrapper(const Sigmod::Ability* ability, SigmodWrapper* parent) : +Sigscript::AbilityWrapper::AbilityWrapper(const Sigmod::Ability* ability, GameWrapper* parent) : ObjectWrapper(ability, parent), m_ability(ability) { diff --git a/sigscript/AbilityWrapper.h b/sigscript/AbilityWrapper.h index cc7d04ce..5a0c3d94 100644 --- a/sigscript/AbilityWrapper.h +++ b/sigscript/AbilityWrapper.h @@ -37,7 +37,7 @@ class SIGSCRIPT_EXPORT AbilityWrapper : public ObjectWrapper Q_OBJECT public: - static AbilityWrapper* create(const Sigmod::Ability* ability, SigmodWrapper* parent); + static AbilityWrapper* create(const Sigmod::Ability* ability, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE int priority() const; @@ -46,7 +46,7 @@ class SIGSCRIPT_EXPORT AbilityWrapper : public ObjectWrapper Q_SCRIPTABLE Sigcore::Script worldScript() const; Q_SCRIPTABLE Sigcore::Script priorityScript() const; private: - AbilityWrapper(const Sigmod::Ability* ability, SigmodWrapper* parent); + AbilityWrapper(const Sigmod::Ability* ability, GameWrapper* parent); AbilityWrapper& operator=(const AbilityWrapper& rhs); const Sigmod::Ability* m_ability; diff --git a/sigscript/AuthorWrapper.cpp b/sigscript/AuthorWrapper.cpp index d26eec96..8b23352d 100644 --- a/sigscript/AuthorWrapper.cpp +++ b/sigscript/AuthorWrapper.cpp @@ -19,12 +19,12 @@ #include "AuthorWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Author.h> -Sigscript::AuthorWrapper* Sigscript::AuthorWrapper::create(const Sigmod::Author* author, SigmodWrapper* parent) +Sigscript::AuthorWrapper* Sigscript::AuthorWrapper::create(const Sigmod::Author* author, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(author->className(), author->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::AuthorWrapper* Sigscript::AuthorWrapper::create(const Sigmod::Author* return qobject_cast<AuthorWrapper*>(m_instances[sig]); } -Sigscript::AuthorWrapper::AuthorWrapper(const Sigmod::Author* author, SigmodWrapper* parent) : +Sigscript::AuthorWrapper::AuthorWrapper(const Sigmod::Author* author, GameWrapper* parent) : ObjectWrapper(author, parent), m_author(author) { diff --git a/sigscript/AuthorWrapper.h b/sigscript/AuthorWrapper.h index aa3e74b9..316fbef4 100644 --- a/sigscript/AuthorWrapper.h +++ b/sigscript/AuthorWrapper.h @@ -34,13 +34,13 @@ class SIGSCRIPT_EXPORT AuthorWrapper : public ObjectWrapper Q_OBJECT public: - static AuthorWrapper* create(const Sigmod::Author* author, SigmodWrapper* parent); + static AuthorWrapper* create(const Sigmod::Author* author, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE QString email() const; Q_SCRIPTABLE QString role() const; private: - AuthorWrapper(const Sigmod::Author* author, SigmodWrapper* parent); + AuthorWrapper(const Sigmod::Author* author, GameWrapper* parent); AuthorWrapper& operator=(const AuthorWrapper& rhs); const Sigmod::Author* m_author; diff --git a/sigscript/BadgeWrapper.cpp b/sigscript/BadgeWrapper.cpp index f57df46e..5afccd65 100644 --- a/sigscript/BadgeWrapper.cpp +++ b/sigscript/BadgeWrapper.cpp @@ -19,12 +19,12 @@ #include "BadgeWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Badge.h> -Sigscript::BadgeWrapper* Sigscript::BadgeWrapper::create(const Sigmod::Badge* badge, SigmodWrapper* parent) +Sigscript::BadgeWrapper* Sigscript::BadgeWrapper::create(const Sigmod::Badge* badge, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(badge->className(), badge->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::BadgeWrapper* Sigscript::BadgeWrapper::create(const Sigmod::Badge* ba return qobject_cast<BadgeWrapper*>(m_instances[sig]); } -Sigscript::BadgeWrapper::BadgeWrapper(const Sigmod::Badge* badge, SigmodWrapper* parent) : +Sigscript::BadgeWrapper::BadgeWrapper(const Sigmod::Badge* badge, GameWrapper* parent) : ObjectWrapper(badge, parent), m_badge(badge) { @@ -45,12 +45,12 @@ QString Sigscript::BadgeWrapper::name() const Sigscript::SpriteWrapper* Sigscript::BadgeWrapper::face() { - return sigmod()->sprite(m_badge->face()); + return game()->sprite(m_badge->face()); } Sigscript::SpriteWrapper* Sigscript::BadgeWrapper::badge() { - return sigmod()->sprite(m_badge->badge()); + return game()->sprite(m_badge->badge()); } int Sigscript::BadgeWrapper::obey() const diff --git a/sigscript/BadgeWrapper.h b/sigscript/BadgeWrapper.h index 95856c08..59db9d91 100644 --- a/sigscript/BadgeWrapper.h +++ b/sigscript/BadgeWrapper.h @@ -43,7 +43,7 @@ class SIGSCRIPT_EXPORT BadgeWrapper : public ObjectWrapper Q_OBJECT public: - static BadgeWrapper* create(const Sigmod::Badge* badge, SigmodWrapper* parent); + static BadgeWrapper* create(const Sigmod::Badge* badge, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE SpriteWrapper* face(); @@ -51,7 +51,7 @@ class SIGSCRIPT_EXPORT BadgeWrapper : public ObjectWrapper Q_SCRIPTABLE int obey() const; Q_SCRIPTABLE Sigcore::Fraction stat(const Sigmod::Stat stat) const; private: - BadgeWrapper(const Sigmod::Badge* badge, SigmodWrapper* parent); + BadgeWrapper(const Sigmod::Badge* badge, GameWrapper* parent); BadgeWrapper& operator=(const BadgeWrapper& rhs); const Sigmod::Badge* m_badge; diff --git a/sigscript/CMakeLists.txt b/sigscript/CMakeLists.txt index 0e947633..79b99761 100644 --- a/sigscript/CMakeLists.txt +++ b/sigscript/CMakeLists.txt @@ -12,6 +12,7 @@ set(sigscript_HEADERS CoinListWrapper.h CoinListItemWrapper.h EggGroupWrapper.h + GameWrapper.h GlobalScriptWrapper.h ItemWrapper.h ItemTypeWrapper.h @@ -27,7 +28,6 @@ set(sigscript_HEADERS NatureWrapper.h ObjectWrapper.h RulesWrapper.h - SigmodWrapper.h SkinWrapper.h SoundWrapper.h SpeciesWrapper.h @@ -49,6 +49,7 @@ set(sigscript_SRCS CoinListWrapper.cpp CoinListItemWrapper.cpp EggGroupWrapper.cpp + GameWrapper.cpp GlobalScriptWrapper.cpp ItemWrapper.cpp ItemTypeWrapper.cpp @@ -64,7 +65,6 @@ set(sigscript_SRCS NatureWrapper.cpp ObjectWrapper.cpp RulesWrapper.cpp - SigmodWrapper.cpp SkinWrapper.cpp SoundWrapper.cpp SpeciesWrapper.cpp diff --git a/sigscript/CoinListItemWrapper.cpp b/sigscript/CoinListItemWrapper.cpp index fd154efe..70faa97b 100644 --- a/sigscript/CoinListItemWrapper.cpp +++ b/sigscript/CoinListItemWrapper.cpp @@ -20,7 +20,7 @@ // Sigscript includes #include "CoinListWrapper.h" -#include "SigmodWrapper.h" +#include "GameWrapper.h" Sigscript::CoinListItemWrapper* Sigscript::CoinListItemWrapper::create(const Sigmod::CoinListItem* object, CoinListWrapper* parent) { @@ -53,14 +53,14 @@ Sigmod::CoinListItem::Type Sigscript::CoinListItemWrapper::type() const Sigscript::ItemWrapper* Sigscript::CoinListItemWrapper::itemObject() { if (m_object->type() == Sigmod::CoinListItem::Item) - return sigmod()->item(m_object->object()); + return game()->item(m_object->object()); return NULL; } Sigscript::SpeciesWrapper* Sigscript::CoinListItemWrapper::speciesObject() { if (m_object->type() == Sigmod::CoinListItem::Species) - return sigmod()->species(m_object->object()); + return game()->species(m_object->object()); return NULL; } diff --git a/sigscript/CoinListWrapper.cpp b/sigscript/CoinListWrapper.cpp index eafe7108..f2ee2cc2 100644 --- a/sigscript/CoinListWrapper.cpp +++ b/sigscript/CoinListWrapper.cpp @@ -20,12 +20,12 @@ // Sigscript includes #include "CoinListItemWrapper.h" -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/CoinList.h> -Sigscript::CoinListWrapper* Sigscript::CoinListWrapper::create(const Sigmod::CoinList* coinList, SigmodWrapper* parent) +Sigscript::CoinListWrapper* Sigscript::CoinListWrapper::create(const Sigmod::CoinList* coinList, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(coinList->className(), coinList->id())); if (!m_instances.contains(sig)) @@ -33,7 +33,7 @@ Sigscript::CoinListWrapper* Sigscript::CoinListWrapper::create(const Sigmod::Coi return qobject_cast<CoinListWrapper*>(m_instances[sig]); } -Sigscript::CoinListWrapper::CoinListWrapper(const Sigmod::CoinList* coinList, SigmodWrapper* parent) : +Sigscript::CoinListWrapper::CoinListWrapper(const Sigmod::CoinList* coinList, GameWrapper* parent) : ObjectWrapper(coinList, parent), m_coinList(coinList) { diff --git a/sigscript/CoinListWrapper.h b/sigscript/CoinListWrapper.h index 6665054f..042f1746 100644 --- a/sigscript/CoinListWrapper.h +++ b/sigscript/CoinListWrapper.h @@ -33,14 +33,14 @@ class CoinList; namespace Sigscript { class CoinListItemWrapper; -class SigmodWrapper; +class GameWrapper; class SIGSCRIPT_EXPORT CoinListWrapper : public ObjectWrapper { Q_OBJECT public: - static CoinListWrapper* create(const Sigmod::CoinList* coinList, SigmodWrapper* parent); + static CoinListWrapper* create(const Sigmod::CoinList* coinList, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE Sigcore::Script script() const; @@ -48,7 +48,7 @@ class SIGSCRIPT_EXPORT CoinListWrapper : public ObjectWrapper Q_SCRIPTABLE CoinListItemWrapper* item(const int index); Q_SCRIPTABLE int itemCount() const; private: - CoinListWrapper(const Sigmod::CoinList* coinList, SigmodWrapper* parent); + CoinListWrapper(const Sigmod::CoinList* coinList, GameWrapper* parent); CoinListWrapper& operator=(const CoinListWrapper& rhs); const Sigmod::CoinList* m_coinList; diff --git a/sigscript/EggGroupWrapper.cpp b/sigscript/EggGroupWrapper.cpp index 4e19c7ed..3c70c91c 100644 --- a/sigscript/EggGroupWrapper.cpp +++ b/sigscript/EggGroupWrapper.cpp @@ -19,12 +19,12 @@ #include "EggGroupWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/EggGroup.h> -Sigscript::EggGroupWrapper* Sigscript::EggGroupWrapper::create(const Sigmod::EggGroup* eggGroup, SigmodWrapper* parent) +Sigscript::EggGroupWrapper* Sigscript::EggGroupWrapper::create(const Sigmod::EggGroup* eggGroup, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(eggGroup->className(), eggGroup->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::EggGroupWrapper* Sigscript::EggGroupWrapper::create(const Sigmod::Egg return qobject_cast<EggGroupWrapper*>(m_instances[sig]); } -Sigscript::EggGroupWrapper::EggGroupWrapper(const Sigmod::EggGroup* eggGroup, SigmodWrapper* parent) : +Sigscript::EggGroupWrapper::EggGroupWrapper(const Sigmod::EggGroup* eggGroup, GameWrapper* parent) : ObjectWrapper(eggGroup, parent), m_eggGroup(eggGroup) { diff --git a/sigscript/EggGroupWrapper.h b/sigscript/EggGroupWrapper.h index dfacd9f4..75b94dc9 100644 --- a/sigscript/EggGroupWrapper.h +++ b/sigscript/EggGroupWrapper.h @@ -34,11 +34,11 @@ class SIGSCRIPT_EXPORT EggGroupWrapper : public ObjectWrapper Q_OBJECT public: - static EggGroupWrapper* create(const Sigmod::EggGroup* eggGroup, SigmodWrapper* parent); + static EggGroupWrapper* create(const Sigmod::EggGroup* eggGroup, GameWrapper* parent); Q_SCRIPTABLE QString name() const; private: - EggGroupWrapper(const Sigmod::EggGroup* eggGroup, SigmodWrapper* parent); + EggGroupWrapper(const Sigmod::EggGroup* eggGroup, GameWrapper* parent); EggGroupWrapper& operator=(const EggGroupWrapper& rhs); const Sigmod::EggGroup* m_eggGroup; diff --git a/sigscript/SigmodWrapper.cpp b/sigscript/GameWrapper.cpp index 39e51f17..39e51f17 100644 --- a/sigscript/SigmodWrapper.cpp +++ b/sigscript/GameWrapper.cpp diff --git a/sigscript/SigmodWrapper.h b/sigscript/GameWrapper.h index 48515286..48515286 100644 --- a/sigscript/SigmodWrapper.h +++ b/sigscript/GameWrapper.h diff --git a/sigscript/Global.h b/sigscript/Global.h index c1529bff..4483e0b5 100644 --- a/sigscript/Global.h +++ b/sigscript/Global.h @@ -37,7 +37,7 @@ #ifdef MAKE_SIGSCRIPT_LIB #define ALLOW_OVERRIDE_SO(class, type, variable) \ - if (sigmod()->singlePlayer()) \ + if (game()->singlePlayer()) \ { \ ALLOW_OVERRIDE(class, type, variable); \ } diff --git a/sigscript/GlobalScriptWrapper.cpp b/sigscript/GlobalScriptWrapper.cpp index 00144cff..05b60637 100644 --- a/sigscript/GlobalScriptWrapper.cpp +++ b/sigscript/GlobalScriptWrapper.cpp @@ -19,12 +19,12 @@ #include "GlobalScriptWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/GlobalScript.h> -Sigscript::GlobalScriptWrapper* Sigscript::GlobalScriptWrapper::create(const Sigmod::GlobalScript* globalScript, SigmodWrapper* parent) +Sigscript::GlobalScriptWrapper* Sigscript::GlobalScriptWrapper::create(const Sigmod::GlobalScript* globalScript, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(globalScript->className(), globalScript->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::GlobalScriptWrapper* Sigscript::GlobalScriptWrapper::create(const Sig return qobject_cast<GlobalScriptWrapper*>(m_instances[sig]); } -Sigscript::GlobalScriptWrapper::GlobalScriptWrapper(const Sigmod::GlobalScript* globalScript, SigmodWrapper* parent) : +Sigscript::GlobalScriptWrapper::GlobalScriptWrapper(const Sigmod::GlobalScript* globalScript, GameWrapper* parent) : ObjectWrapper(globalScript, parent), m_globalScript(globalScript) { diff --git a/sigscript/GlobalScriptWrapper.h b/sigscript/GlobalScriptWrapper.h index 55df12e7..65630cfe 100644 --- a/sigscript/GlobalScriptWrapper.h +++ b/sigscript/GlobalScriptWrapper.h @@ -37,12 +37,12 @@ class SIGSCRIPT_EXPORT GlobalScriptWrapper : public ObjectWrapper Q_OBJECT public: - static GlobalScriptWrapper* create(const Sigmod::GlobalScript* globalScript, SigmodWrapper* parent); + static GlobalScriptWrapper* create(const Sigmod::GlobalScript* globalScript, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE Sigcore::Script script() const; private: - GlobalScriptWrapper(const Sigmod::GlobalScript* globalScript, SigmodWrapper* parent); + GlobalScriptWrapper(const Sigmod::GlobalScript* globalScript, GameWrapper* parent); GlobalScriptWrapper& operator=(const GlobalScriptWrapper& rhs); const Sigmod::GlobalScript* m_globalScript; diff --git a/sigscript/ItemTypeWrapper.cpp b/sigscript/ItemTypeWrapper.cpp index 42008c7a..9e2e302b 100644 --- a/sigscript/ItemTypeWrapper.cpp +++ b/sigscript/ItemTypeWrapper.cpp @@ -19,9 +19,9 @@ #include "ItemTypeWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" -Sigscript::ItemTypeWrapper* Sigscript::ItemTypeWrapper::create(const Sigmod::ItemType* itemType, SigmodWrapper* parent) +Sigscript::ItemTypeWrapper* Sigscript::ItemTypeWrapper::create(const Sigmod::ItemType* itemType, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(itemType->className(), itemType->id())); if (!m_instances.contains(sig)) @@ -29,7 +29,7 @@ Sigscript::ItemTypeWrapper* Sigscript::ItemTypeWrapper::create(const Sigmod::Ite return qobject_cast<ItemTypeWrapper*>(m_instances[sig]); } -Sigscript::ItemTypeWrapper::ItemTypeWrapper(const Sigmod::ItemType* itemType, SigmodWrapper* parent) : +Sigscript::ItemTypeWrapper::ItemTypeWrapper(const Sigmod::ItemType* itemType, GameWrapper* parent) : ObjectWrapper(itemType, parent), m_itemType(itemType) { diff --git a/sigscript/ItemTypeWrapper.h b/sigscript/ItemTypeWrapper.h index 50322aa2..f4bbd842 100644 --- a/sigscript/ItemTypeWrapper.h +++ b/sigscript/ItemTypeWrapper.h @@ -31,7 +31,7 @@ class SIGSCRIPT_EXPORT ItemTypeWrapper : public ObjectWrapper Q_OBJECT public: - static ItemTypeWrapper* create(const Sigmod::ItemType* itemType, SigmodWrapper* parent); + static ItemTypeWrapper* create(const Sigmod::ItemType* itemType, GameWrapper* parent); Q_SCRIPTABLE Sigmod::ItemType::Count count(const QString& name) const; @@ -41,7 +41,7 @@ class SIGSCRIPT_EXPORT ItemTypeWrapper : public ObjectWrapper Q_SCRIPTABLE int maxWeight() const; Q_SCRIPTABLE int count() const; private: - ItemTypeWrapper(const Sigmod::ItemType* itemType, SigmodWrapper* parent); + ItemTypeWrapper(const Sigmod::ItemType* itemType, GameWrapper* parent); ItemTypeWrapper& operator=(const ItemTypeWrapper& rhs); const Sigmod::ItemType* m_itemType; diff --git a/sigscript/ItemWrapper.cpp b/sigscript/ItemWrapper.cpp index 72c711db..54290cba 100644 --- a/sigscript/ItemWrapper.cpp +++ b/sigscript/ItemWrapper.cpp @@ -19,12 +19,12 @@ #include "ItemWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Item.h> -Sigscript::ItemWrapper* Sigscript::ItemWrapper::create(const Sigmod::Item* item, SigmodWrapper* parent) +Sigscript::ItemWrapper* Sigscript::ItemWrapper::create(const Sigmod::Item* item, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(item->className(), item->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::ItemWrapper* Sigscript::ItemWrapper::create(const Sigmod::Item* item, return qobject_cast<ItemWrapper*>(m_instances[sig]); } -Sigscript::ItemWrapper::ItemWrapper(const Sigmod::Item* item, SigmodWrapper* parent) : +Sigscript::ItemWrapper::ItemWrapper(const Sigmod::Item* item, GameWrapper* parent) : ObjectWrapper(item, parent), m_item(item) { @@ -50,7 +50,7 @@ bool Sigscript::ItemWrapper::sellable() const Sigscript::ItemTypeWrapper* Sigscript::ItemWrapper::type() { - return sigmod()->itemType(m_item->type()); + return game()->itemType(m_item->type()); } int Sigscript::ItemWrapper::price() const diff --git a/sigscript/ItemWrapper.h b/sigscript/ItemWrapper.h index a5c59f0d..88903c0c 100644 --- a/sigscript/ItemWrapper.h +++ b/sigscript/ItemWrapper.h @@ -39,7 +39,7 @@ class SIGSCRIPT_EXPORT ItemWrapper : public ObjectWrapper Q_OBJECT public: - static ItemWrapper* create(const Sigmod::Item* item, SigmodWrapper* parent); + static ItemWrapper* create(const Sigmod::Item* item, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE bool sellable() const; @@ -50,7 +50,7 @@ class SIGSCRIPT_EXPORT ItemWrapper : public ObjectWrapper Q_SCRIPTABLE QString description() const; Q_SCRIPTABLE Sigcore::Script script() const; private: - ItemWrapper(const Sigmod::Item* item, SigmodWrapper* parent); + ItemWrapper(const Sigmod::Item* item, GameWrapper* parent); ItemWrapper& operator=(const ItemWrapper& rhs); const Sigmod::Item* m_item; diff --git a/sigscript/MapEffectWrapper.cpp b/sigscript/MapEffectWrapper.cpp index 6b3c0d0d..e7644b70 100644 --- a/sigscript/MapEffectWrapper.cpp +++ b/sigscript/MapEffectWrapper.cpp @@ -19,8 +19,8 @@ #include "MapEffectWrapper.h" // Sigscript includes +#include "GameWrapper.h" #include "MapWrapper.h" -#include "SigmodWrapper.h" // Sigmod includes #include <sigmod/MapEffect.h> @@ -52,7 +52,7 @@ QPoint Sigscript::MapEffectWrapper::position() const Sigscript::SkinWrapper* Sigscript::MapEffectWrapper::skin() { - return sigmod()->skin(m_effect->skin()); + return game()->skin(m_effect->skin()); } bool Sigscript::MapEffectWrapper::isGhost() const diff --git a/sigscript/MapTileWrapper.cpp b/sigscript/MapTileWrapper.cpp index 0e7959e7..ca79c780 100644 --- a/sigscript/MapTileWrapper.cpp +++ b/sigscript/MapTileWrapper.cpp @@ -19,8 +19,8 @@ #include "MapTileWrapper.h" // Sigscript includes +#include "GameWrapper.h" #include "MapWrapper.h" -#include "SigmodWrapper.h" // Sigmod includes #include <sigmod/MapTile.h> @@ -41,7 +41,7 @@ Sigscript::MapTileWrapper::MapTileWrapper(const Sigmod::MapTile* tile, MapWrappe Sigscript::TileWrapper* Sigscript::MapTileWrapper::tile() { - return sigmod()->tile(m_tile->tile()); + return game()->tile(m_tile->tile()); } QPoint Sigscript::MapTileWrapper::position() const diff --git a/sigscript/MapTrainerTeamMemberWrapper.cpp b/sigscript/MapTrainerTeamMemberWrapper.cpp index 0ccb7ad2..a2c34a5d 100644 --- a/sigscript/MapTrainerTeamMemberWrapper.cpp +++ b/sigscript/MapTrainerTeamMemberWrapper.cpp @@ -19,8 +19,8 @@ #include "MapTrainerTeamMemberWrapper.h" // Sigscript includes +#include "GameWrapper.h" #include "MapTrainerWrapper.h" -#include "SigmodWrapper.h" // Sigmod includes #include <sigmod/MapTrainerTeamMember.h> @@ -41,7 +41,7 @@ Sigscript::MapTrainerTeamMemberWrapper::MapTrainerTeamMemberWrapper(const Sigmod Sigscript::SpeciesWrapper* Sigscript::MapTrainerTeamMemberWrapper::species() { - return sigmod()->species(m_teamMember->species()); + return game()->species(m_teamMember->species()); } int Sigscript::MapTrainerTeamMemberWrapper::level() const @@ -55,7 +55,7 @@ QList<Sigscript::AbilityWrapper*> Sigscript::MapTrainerTeamMemberWrapper::abilit QList<int> abilityIds = m_teamMember->ability(); QList<AbilityWrapper*> abilities; foreach (int id, abilityIds) - abilities.append(sigmod()->ability(id)); + abilities.append(game()->ability(id)); return abilities; } @@ -65,7 +65,7 @@ QMap<Sigscript::ItemWrapper*, int> Sigscript::MapTrainerTeamMemberWrapper::items QList<int> itemIds = itemMap.keys(); QMap<ItemWrapper*, int> items; foreach (int id, itemIds) - items[sigmod()->item(id)] = itemMap[id]; + items[game()->item(id)] = itemMap[id]; return items; } @@ -74,7 +74,7 @@ QList<Sigscript::MoveWrapper*> Sigscript::MapTrainerTeamMemberWrapper::moves() QList<int> moveIds = m_teamMember->move(); QList<MoveWrapper*> moves; foreach (int id, moveIds) - moves.append(sigmod()->move(id)); + moves.append(game()->move(id)); return moves; } @@ -83,6 +83,6 @@ QList<Sigscript::NatureWrapper*> Sigscript::MapTrainerTeamMemberWrapper::natures QList<int> natureIds = m_teamMember->nature(); QList<NatureWrapper*> natures; foreach (int id, natureIds) - natures.append(sigmod()->nature(id)); + natures.append(game()->nature(id)); return natures; } diff --git a/sigscript/MapTrainerWrapper.cpp b/sigscript/MapTrainerWrapper.cpp index 082daf75..084e204d 100644 --- a/sigscript/MapTrainerWrapper.cpp +++ b/sigscript/MapTrainerWrapper.cpp @@ -19,9 +19,9 @@ #include "MapTrainerWrapper.h" // Sigscript includes +#include "GameWrapper.h" #include "MapWrapper.h" #include "MapTrainerTeamMemberWrapper.h" -#include "SigmodWrapper.h" // Sigmod includes #include <sigmod/MapTrainer.h> @@ -47,7 +47,7 @@ QString Sigscript::MapTrainerWrapper::name() const Sigscript::TrainerWrapper* Sigscript::MapTrainerWrapper::trainerClass() { - return sigmod()->trainer(m_trainer->trainerClass()); + return game()->trainer(m_trainer->trainerClass()); } QPoint Sigscript::MapTrainerWrapper::position() const diff --git a/sigscript/MapWarpWrapper.cpp b/sigscript/MapWarpWrapper.cpp index 70547608..98463e5d 100644 --- a/sigscript/MapWarpWrapper.cpp +++ b/sigscript/MapWarpWrapper.cpp @@ -19,8 +19,8 @@ #include "MapWarpWrapper.h" // Sigscript includes +#include "GameWrapper.h" #include "MapWrapper.h" -#include "SigmodWrapper.h" Sigscript::MapWarpWrapper* Sigscript::MapWarpWrapper::create(const Sigmod::MapWarp* warp, MapWrapper* parent) { @@ -67,7 +67,7 @@ Sigmod::MapWarp::Type Sigscript::MapWarpWrapper::type() const Sigscript::MapWarpWrapper* Sigscript::MapWarpWrapper::toWarp() { - return sigmod()->map(m_warp->toMap())->warp(m_warp->toWarp()); + return game()->map(m_warp->toMap())->warp(m_warp->toWarp()); } Sigcore::Script Sigscript::MapWarpWrapper::script() const diff --git a/sigscript/MapWildListEncounterWrapper.cpp b/sigscript/MapWildListEncounterWrapper.cpp index 315346f7..fc7ec785 100644 --- a/sigscript/MapWildListEncounterWrapper.cpp +++ b/sigscript/MapWildListEncounterWrapper.cpp @@ -19,8 +19,8 @@ #include "MapWildListEncounterWrapper.h" // Sigscript includes +#include "GameWrapper.h" #include "MapWildListWrapper.h" -#include "SigmodWrapper.h" // Sigmod includes #include <sigmod/MapWildListEncounter.h> @@ -41,7 +41,7 @@ Sigscript::MapWildListEncounterWrapper::MapWildListEncounterWrapper(const Sigmod Sigscript::SpeciesWrapper* Sigscript::MapWildListEncounterWrapper::species() { - return sigmod()->species(m_encounter->species()); + return game()->species(m_encounter->species()); } int Sigscript::MapWildListEncounterWrapper::level() const diff --git a/sigscript/MapWrapper.cpp b/sigscript/MapWrapper.cpp index b406871e..6ca1872b 100644 --- a/sigscript/MapWrapper.cpp +++ b/sigscript/MapWrapper.cpp @@ -19,19 +19,19 @@ #include "MapWrapper.h" // Sigscript includes +#include "GameWrapper.h" #include "MapEffectWrapper.h" #include "MapTileWrapper.h" #include "MapTrainerWrapper.h" #include "MapWarpWrapper.h" #include "MapWildListWrapper.h" -#include "SigmodWrapper.h" // Sigmod includes #include <sigmod/MapEffect.h> #include <sigmod/MapTrainer.h> #include <sigmod/MapWildList.h> -Sigscript::MapWrapper* Sigscript::MapWrapper::create(const Sigmod::Map* map, SigmodWrapper* parent) +Sigscript::MapWrapper* Sigscript::MapWrapper::create(const Sigmod::Map* map, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(map->className(), map->id())); if (!m_instances.contains(sig)) @@ -39,7 +39,7 @@ Sigscript::MapWrapper* Sigscript::MapWrapper::create(const Sigmod::Map* map, Sig return qobject_cast<MapWrapper*>(m_instances[sig]); } -Sigscript::MapWrapper::MapWrapper(const Sigmod::Map* map, SigmodWrapper* parent) : +Sigscript::MapWrapper::MapWrapper(const Sigmod::Map* map, GameWrapper* parent) : ObjectWrapper(map, parent), m_map(map) { diff --git a/sigscript/MapWrapper.h b/sigscript/MapWrapper.h index 559c4c81..a3b7d172 100644 --- a/sigscript/MapWrapper.h +++ b/sigscript/MapWrapper.h @@ -39,7 +39,7 @@ class SIGSCRIPT_EXPORT MapWrapper : public ObjectWrapper Q_OBJECT public: - static MapWrapper* create(const Sigmod::Map* map, SigmodWrapper* parent); + static MapWrapper* create(const Sigmod::Map* map, GameWrapper* parent); MapEffectWrapper* effect(const int id); MapTileWrapper* tile(const int id); @@ -60,7 +60,7 @@ class SIGSCRIPT_EXPORT MapWrapper : public ObjectWrapper Q_SCRIPTABLE MapWarpWrapper* warp(const QString& name); Q_SCRIPTABLE MapWildListWrapper* wildList(const QString& name); private: - MapWrapper(const Sigmod::Map* map, SigmodWrapper* parent); + MapWrapper(const Sigmod::Map* map, GameWrapper* parent); MapWrapper& operator=(const MapWrapper& rhs); const Sigmod::Map* m_map; diff --git a/sigscript/MoveWrapper.cpp b/sigscript/MoveWrapper.cpp index 9025903c..64231b5f 100644 --- a/sigscript/MoveWrapper.cpp +++ b/sigscript/MoveWrapper.cpp @@ -19,12 +19,12 @@ #include "MoveWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Move.h> -Sigscript::MoveWrapper* Sigscript::MoveWrapper::create(const Sigmod::Move* move, SigmodWrapper* parent) +Sigscript::MoveWrapper* Sigscript::MoveWrapper::create(const Sigmod::Move* move, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(move->className(), move->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::MoveWrapper* Sigscript::MoveWrapper::create(const Sigmod::Move* move, return qobject_cast<MoveWrapper*>(m_instances[sig]); } -Sigscript::MoveWrapper::MoveWrapper(const Sigmod::Move* move, SigmodWrapper* parent) : +Sigscript::MoveWrapper::MoveWrapper(const Sigmod::Move* move, GameWrapper* parent) : ObjectWrapper(move, parent), m_move(move) { @@ -57,7 +57,7 @@ int Sigscript::MoveWrapper::power() const Sigscript::TypeWrapper* Sigscript::MoveWrapper::type() { - return sigmod()->type(m_move->type()); + return game()->type(m_move->type()); } bool Sigscript::MoveWrapper::special() const diff --git a/sigscript/MoveWrapper.h b/sigscript/MoveWrapper.h index 09704002..a792a2ec 100644 --- a/sigscript/MoveWrapper.h +++ b/sigscript/MoveWrapper.h @@ -40,7 +40,7 @@ class SIGSCRIPT_EXPORT MoveWrapper : public ObjectWrapper Q_OBJECT public: - static MoveWrapper* create(const Sigmod::Move* move, SigmodWrapper* parent); + static MoveWrapper* create(const Sigmod::Move* move, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE Sigcore::Fraction accuracy() const; @@ -54,7 +54,7 @@ class SIGSCRIPT_EXPORT MoveWrapper : public ObjectWrapper Q_SCRIPTABLE Sigcore::Script worldScript() const; Q_SCRIPTABLE Sigcore::Script priorityScript() const; private: - MoveWrapper(const Sigmod::Move* move, SigmodWrapper* parent); + MoveWrapper(const Sigmod::Move* move, GameWrapper* parent); MoveWrapper& operator=(const MoveWrapper& rhs); const Sigmod::Move* m_move; diff --git a/sigscript/NatureWrapper.cpp b/sigscript/NatureWrapper.cpp index 57b0635a..f7b7af56 100644 --- a/sigscript/NatureWrapper.cpp +++ b/sigscript/NatureWrapper.cpp @@ -19,12 +19,12 @@ #include "NatureWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Nature.h> -Sigscript::NatureWrapper* Sigscript::NatureWrapper::create(const Sigmod::Nature* nature, SigmodWrapper* parent) +Sigscript::NatureWrapper* Sigscript::NatureWrapper::create(const Sigmod::Nature* nature, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(nature->className(), nature->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::NatureWrapper* Sigscript::NatureWrapper::create(const Sigmod::Nature* return qobject_cast<NatureWrapper*>(m_instances[sig]); } -Sigscript::NatureWrapper::NatureWrapper(const Sigmod::Nature* nature, SigmodWrapper* parent) : +Sigscript::NatureWrapper::NatureWrapper(const Sigmod::Nature* nature, GameWrapper* parent) : ObjectWrapper(nature, parent), m_nature(nature) { diff --git a/sigscript/NatureWrapper.h b/sigscript/NatureWrapper.h index 280dc491..9393578e 100644 --- a/sigscript/NatureWrapper.h +++ b/sigscript/NatureWrapper.h @@ -40,13 +40,13 @@ class SIGSCRIPT_EXPORT NatureWrapper : public ObjectWrapper Q_OBJECT public: - static NatureWrapper* create(const Sigmod::Nature* nature, SigmodWrapper* parent); + static NatureWrapper* create(const Sigmod::Nature* nature, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE Sigcore::Fraction stat(const Sigmod::Stat stat) const; Q_SCRIPTABLE int weight() const; private: - NatureWrapper(const Sigmod::Nature* nature, SigmodWrapper* parent); + NatureWrapper(const Sigmod::Nature* nature, GameWrapper* parent); NatureWrapper& operator=(const NatureWrapper& rhs); const Sigmod::Nature* m_nature; diff --git a/sigscript/ObjectWrapper.cpp b/sigscript/ObjectWrapper.cpp index fe656874..2e36dec1 100644 --- a/sigscript/ObjectWrapper.cpp +++ b/sigscript/ObjectWrapper.cpp @@ -19,11 +19,11 @@ #include "ObjectWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes +#include <sigmod/Game.h> #include <sigmod/Object.h> -#include <sigmod/Sigmod.h> QMap<Sigscript::ObjectWrapper::Signature, Sigscript::ObjectWrapper*> Sigscript::ObjectWrapper::m_instances; @@ -48,16 +48,16 @@ Sigscript::ObjectWrapper* Sigscript::ObjectWrapper::parent() return m_parent; } -const Sigscript::SigmodWrapper* Sigscript::ObjectWrapper::sigmod() const +const Sigscript::GameWrapper* Sigscript::ObjectWrapper::game() const { if (m_parent) - return m_parent->sigmod(); - return qobject_cast<const SigmodWrapper*>(m_parent); + return m_parent->game(); + return qobject_cast<const GameWrapper*>(m_parent); } -Sigscript::SigmodWrapper* Sigscript::ObjectWrapper::sigmod() +Sigscript::GameWrapper* Sigscript::ObjectWrapper::game() { if (m_parent) - return m_parent->sigmod(); - return qobject_cast<SigmodWrapper*>(m_parent); + return m_parent->game(); + return qobject_cast<GameWrapper*>(m_parent); } diff --git a/sigscript/ObjectWrapper.h b/sigscript/ObjectWrapper.h index bff2ef86..23bd5afd 100644 --- a/sigscript/ObjectWrapper.h +++ b/sigscript/ObjectWrapper.h @@ -34,7 +34,7 @@ class Object; namespace Sigscript { -class SigmodWrapper; +class GameWrapper; class SIGSCRIPT_EXPORT ObjectWrapper : public Config { @@ -52,8 +52,8 @@ class SIGSCRIPT_EXPORT ObjectWrapper : public Config const ObjectWrapper* parent() const; ObjectWrapper* parent(); - const SigmodWrapper* sigmod() const; - SigmodWrapper* sigmod(); + const GameWrapper* game() const; + GameWrapper* game(); protected: static QMap<Signature, ObjectWrapper*> m_instances; private: diff --git a/sigscript/RulesWrapper.cpp b/sigscript/RulesWrapper.cpp index bd979667..26f95bb2 100644 --- a/sigscript/RulesWrapper.cpp +++ b/sigscript/RulesWrapper.cpp @@ -19,12 +19,12 @@ #include "RulesWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Rules.h> -Sigscript::RulesWrapper* Sigscript::RulesWrapper::create(const Sigmod::Rules* rules, SigmodWrapper* parent) +Sigscript::RulesWrapper* Sigscript::RulesWrapper::create(const Sigmod::Rules* rules, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(rules->className(), rules->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::RulesWrapper* Sigscript::RulesWrapper::create(const Sigmod::Rules* ru return qobject_cast<RulesWrapper*>(m_instances[sig]); } -Sigscript::RulesWrapper::RulesWrapper(const Sigmod::Rules* rules, SigmodWrapper* parent) : +Sigscript::RulesWrapper::RulesWrapper(const Sigmod::Rules* rules, GameWrapper* parent) : ObjectWrapper(rules, parent), m_rules(rules) { diff --git a/sigscript/RulesWrapper.h b/sigscript/RulesWrapper.h index 45a0d7a5..af68aec0 100644 --- a/sigscript/RulesWrapper.h +++ b/sigscript/RulesWrapper.h @@ -34,7 +34,7 @@ class SIGSCRIPT_EXPORT RulesWrapper : public ObjectWrapper Q_OBJECT public: - static RulesWrapper* create(const Sigmod::Rules* rules, SigmodWrapper* parent); + static RulesWrapper* create(const Sigmod::Rules* rules, GameWrapper* parent); Q_SCRIPTABLE bool genderAllowed() const; Q_SCRIPTABLE bool breedingAllowed() const; @@ -60,7 +60,7 @@ class SIGSCRIPT_EXPORT RulesWrapper : public ObjectWrapper Q_SCRIPTABLE int maxTotalEV() const; Q_SCRIPTABLE int maxEVPerStat() const; private: - RulesWrapper(const Sigmod::Rules* rules, SigmodWrapper* parent); + RulesWrapper(const Sigmod::Rules* rules, GameWrapper* parent); RulesWrapper& operator=(const RulesWrapper& rhs); const Sigmod::Rules* m_rules; diff --git a/sigscript/SkinWrapper.cpp b/sigscript/SkinWrapper.cpp index 2f821b9f..b224944c 100644 --- a/sigscript/SkinWrapper.cpp +++ b/sigscript/SkinWrapper.cpp @@ -19,12 +19,12 @@ #include "SkinWrapper.h" // Sigmod scripting -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Skin.h> -Sigscript::SkinWrapper* Sigscript::SkinWrapper::create(const Sigmod::Skin* skin, SigmodWrapper* parent) +Sigscript::SkinWrapper* Sigscript::SkinWrapper::create(const Sigmod::Skin* skin, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(skin->className(), skin->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::SkinWrapper* Sigscript::SkinWrapper::create(const Sigmod::Skin* skin, return qobject_cast<SkinWrapper*>(m_instances[sig]); } -Sigscript::SkinWrapper::SkinWrapper(const Sigmod::Skin* skin, SigmodWrapper* parent) : +Sigscript::SkinWrapper::SkinWrapper(const Sigmod::Skin* skin, GameWrapper* parent) : ObjectWrapper(skin, parent), m_skin(skin) { diff --git a/sigscript/SkinWrapper.h b/sigscript/SkinWrapper.h index 72efbb47..d0232468 100644 --- a/sigscript/SkinWrapper.h +++ b/sigscript/SkinWrapper.h @@ -37,12 +37,12 @@ class SIGSCRIPT_EXPORT SkinWrapper : public ObjectWrapper Q_OBJECT public: - static SkinWrapper* create(const Sigmod::Skin* skin, SigmodWrapper* parent); + static SkinWrapper* create(const Sigmod::Skin* skin, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE Sigcore::Script script() const; private: - SkinWrapper(const Sigmod::Skin* skin, SigmodWrapper* parent); + SkinWrapper(const Sigmod::Skin* skin, GameWrapper* parent); SkinWrapper& operator=(const SkinWrapper& rhs); const Sigmod::Skin* m_skin; diff --git a/sigscript/SoundWrapper.cpp b/sigscript/SoundWrapper.cpp index 12c39393..83f0c9cc 100644 --- a/sigscript/SoundWrapper.cpp +++ b/sigscript/SoundWrapper.cpp @@ -19,7 +19,7 @@ #include "SoundWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Qt includes #include <QtCore/QBuffer> @@ -28,7 +28,7 @@ #include <Phonon/MediaObject> #include <Phonon/MediaSource> -Sigscript::SoundWrapper* Sigscript::SoundWrapper::create(const Sigmod::Sound* sound, SigmodWrapper* parent) +Sigscript::SoundWrapper* Sigscript::SoundWrapper::create(const Sigmod::Sound* sound, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(sound->className(), sound->id())); if (!m_instances.contains(sig)) @@ -36,7 +36,7 @@ Sigscript::SoundWrapper* Sigscript::SoundWrapper::create(const Sigmod::Sound* so return qobject_cast<SoundWrapper*>(m_instances[sig]); } -Sigscript::SoundWrapper::SoundWrapper(const Sigmod::Sound* sound, SigmodWrapper* parent) : +Sigscript::SoundWrapper::SoundWrapper(const Sigmod::Sound* sound, GameWrapper* parent) : ObjectWrapper(sound, parent), m_sound(sound) { diff --git a/sigscript/SoundWrapper.h b/sigscript/SoundWrapper.h index 54b22535..eb508ee9 100644 --- a/sigscript/SoundWrapper.h +++ b/sigscript/SoundWrapper.h @@ -37,7 +37,7 @@ class SIGSCRIPT_EXPORT SoundWrapper : public ObjectWrapper Q_OBJECT public: - static SoundWrapper* create(const Sigmod::Sound* sound, SigmodWrapper* parent); + static SoundWrapper* create(const Sigmod::Sound* sound, GameWrapper* parent); Q_SCRIPTABLE Sigmod::Sound::Type type(const QString& name) const; @@ -45,7 +45,7 @@ class SIGSCRIPT_EXPORT SoundWrapper : public ObjectWrapper Q_SCRIPTABLE Sigmod::Sound::Type type() const; Q_SCRIPTABLE Phonon::MediaObject* audio(); private: - SoundWrapper(const Sigmod::Sound* sound, SigmodWrapper* parent); + SoundWrapper(const Sigmod::Sound* sound, GameWrapper* parent); SoundWrapper& operator=(const SoundWrapper& rhs); const Sigmod::Sound* m_sound; diff --git a/sigscript/SpeciesMoveWrapper.cpp b/sigscript/SpeciesMoveWrapper.cpp index e503a9c7..960fd080 100644 --- a/sigscript/SpeciesMoveWrapper.cpp +++ b/sigscript/SpeciesMoveWrapper.cpp @@ -19,7 +19,7 @@ #include "SpeciesMoveWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" #include "SpeciesWrapper.h" // Sigmod includes @@ -41,7 +41,7 @@ Sigscript::SpeciesMoveWrapper::SpeciesMoveWrapper(const Sigmod::SpeciesMove* mov Sigscript::MoveWrapper* Sigscript::SpeciesMoveWrapper::move() { - return sigmod()->move(m_move->move()); + return game()->move(m_move->move()); } int Sigscript::SpeciesMoveWrapper::level() const diff --git a/sigscript/SpeciesWrapper.cpp b/sigscript/SpeciesWrapper.cpp index d1ecd188..08a435dc 100644 --- a/sigscript/SpeciesWrapper.cpp +++ b/sigscript/SpeciesWrapper.cpp @@ -19,10 +19,10 @@ #include "SpeciesWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" #include "SpeciesMoveWrapper.h" -Sigscript::SpeciesWrapper* Sigscript::SpeciesWrapper::create(const Sigmod::Species* species, SigmodWrapper* parent) +Sigscript::SpeciesWrapper* Sigscript::SpeciesWrapper::create(const Sigmod::Species* species, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(species->className(), species->id())); if (!m_instances.contains(sig)) @@ -30,7 +30,7 @@ Sigscript::SpeciesWrapper* Sigscript::SpeciesWrapper::create(const Sigmod::Speci return qobject_cast<SpeciesWrapper*>(m_instances[sig]); } -Sigscript::SpeciesWrapper::SpeciesWrapper(const Sigmod::Species* species, SigmodWrapper* parent) : +Sigscript::SpeciesWrapper::SpeciesWrapper(const Sigmod::Species* species, GameWrapper* parent) : ObjectWrapper(species, parent), m_species(species) { @@ -148,27 +148,27 @@ QString Sigscript::SpeciesWrapper::encyclopediaEntry() const Sigscript::SpriteWrapper* Sigscript::SpeciesWrapper::frontMaleSprite() { - return sigmod()->sprite(m_species->frontMaleSprite()); + return game()->sprite(m_species->frontMaleSprite()); } Sigscript::SpriteWrapper* Sigscript::SpeciesWrapper::backMaleSprite() { - return sigmod()->sprite(m_species->backMaleSprite()); + return game()->sprite(m_species->backMaleSprite()); } Sigscript::SpriteWrapper* Sigscript::SpeciesWrapper::frontFemaleSprite() { - return sigmod()->sprite(m_species->frontFemaleSprite()); + return game()->sprite(m_species->frontFemaleSprite()); } Sigscript::SpriteWrapper* Sigscript::SpeciesWrapper::backFemaleSprite() { - return sigmod()->sprite(m_species->backFemaleSprite()); + return game()->sprite(m_species->backFemaleSprite()); } Sigscript::SkinWrapper* Sigscript::SpeciesWrapper::skin() { - return sigmod()->skin(m_species->skin()); + return game()->skin(m_species->skin()); } Sigcore::Fraction Sigscript::SpeciesWrapper::genderFactor() const @@ -192,7 +192,7 @@ QList<Sigscript::TypeWrapper*> Sigscript::SpeciesWrapper::types() QList<int> typeIds = m_species->type(); QList<TypeWrapper*> types; foreach (int id, typeIds) - types.append(sigmod()->type(id)); + types.append(game()->type(id)); return types; } @@ -201,7 +201,7 @@ QList<Sigscript::EggGroupWrapper*> Sigscript::SpeciesWrapper::eggGroups() QList<int> eggGroupIds = m_species->eggGroup(); QList<EggGroupWrapper*> eggGroups; foreach (int id, eggGroupIds) - eggGroups.append(sigmod()->eggGroup(id)); + eggGroups.append(game()->eggGroup(id)); return eggGroups; } @@ -216,7 +216,7 @@ QMap<Sigscript::AbilityWrapper*, int> Sigscript::SpeciesWrapper::abilities() QList<int> abilityIds = abilityMap.keys(); QMap<AbilityWrapper*, int> abilities; foreach (int id, abilityIds) - abilities[sigmod()->ability(id)] = abilityMap[id]; + abilities[game()->ability(id)] = abilityMap[id]; return abilities; } @@ -226,7 +226,7 @@ QMap<Sigscript::ItemWrapper*, int> Sigscript::SpeciesWrapper::items() QList<int> itemIds = itemMap.keys(); QMap<ItemWrapper*, int> items; foreach (int id, itemIds) - items[sigmod()->item(id)] = itemMap[id]; + items[game()->item(id)] = itemMap[id]; return items; } diff --git a/sigscript/SpeciesWrapper.h b/sigscript/SpeciesWrapper.h index f314436a..7bb8fd67 100644 --- a/sigscript/SpeciesWrapper.h +++ b/sigscript/SpeciesWrapper.h @@ -43,7 +43,7 @@ class SIGSCRIPT_EXPORT SpeciesWrapper : public ObjectWrapper Q_OBJECT public: - static SpeciesWrapper* create(const Sigmod::Species* species, SigmodWrapper* parent); + static SpeciesWrapper* create(const Sigmod::Species* species, GameWrapper* parent); Sigcore::Hat<AbilityWrapper*> abilityHat(); Sigcore::Hat<ItemWrapper*> itemHat(); @@ -81,7 +81,7 @@ class SIGSCRIPT_EXPORT SpeciesWrapper : public ObjectWrapper Q_SCRIPTABLE SpeciesMoveWrapper* move(const int index); Q_SCRIPTABLE int moveCount() const; private: - SpeciesWrapper(const Sigmod::Species* species, SigmodWrapper* parent); + SpeciesWrapper(const Sigmod::Species* species, GameWrapper* parent); SpeciesWrapper& operator=(const SpeciesWrapper& rhs); const Sigmod::Species* m_species; diff --git a/sigscript/SpriteWrapper.cpp b/sigscript/SpriteWrapper.cpp index c0f9f0f9..80f22344 100644 --- a/sigscript/SpriteWrapper.cpp +++ b/sigscript/SpriteWrapper.cpp @@ -19,12 +19,12 @@ #include "SpriteWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Sprite.h> -Sigscript::SpriteWrapper* Sigscript::SpriteWrapper::create(const Sigmod::Sprite* sprite, SigmodWrapper* parent) +Sigscript::SpriteWrapper* Sigscript::SpriteWrapper::create(const Sigmod::Sprite* sprite, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(sprite->className(), sprite->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::SpriteWrapper* Sigscript::SpriteWrapper::create(const Sigmod::Sprite* return qobject_cast<SpriteWrapper*>(m_instances[sig]); } -Sigscript::SpriteWrapper::SpriteWrapper(const Sigmod::Sprite* sprite, SigmodWrapper* parent) : +Sigscript::SpriteWrapper::SpriteWrapper(const Sigmod::Sprite* sprite, GameWrapper* parent) : ObjectWrapper(sprite, parent), m_sprite(sprite) { diff --git a/sigscript/SpriteWrapper.h b/sigscript/SpriteWrapper.h index fa224ac2..5f17a63b 100644 --- a/sigscript/SpriteWrapper.h +++ b/sigscript/SpriteWrapper.h @@ -37,12 +37,12 @@ class SIGSCRIPT_EXPORT SpriteWrapper : public ObjectWrapper Q_OBJECT public: - static SpriteWrapper* create(const Sigmod::Sprite* sprite, SigmodWrapper* parent); + static SpriteWrapper* create(const Sigmod::Sprite* sprite, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE QPixmap sprite() const; private: - SpriteWrapper(const Sigmod::Sprite* sprite, SigmodWrapper* parent); + SpriteWrapper(const Sigmod::Sprite* sprite, GameWrapper* parent); SpriteWrapper& operator=(const SpriteWrapper& rhs); QPixmap m_pixmap; diff --git a/sigscript/StatusWrapper.cpp b/sigscript/StatusWrapper.cpp index 92f4ca60..ff749b9e 100644 --- a/sigscript/StatusWrapper.cpp +++ b/sigscript/StatusWrapper.cpp @@ -19,12 +19,12 @@ #include "StatusWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Status.h> -Sigscript::StatusWrapper* Sigscript::StatusWrapper::create(const Sigmod::Status* status, SigmodWrapper* parent) +Sigscript::StatusWrapper* Sigscript::StatusWrapper::create(const Sigmod::Status* status, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(status->className(), status->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::StatusWrapper* Sigscript::StatusWrapper::create(const Sigmod::Status* return qobject_cast<StatusWrapper*>(m_instances[sig]); } -Sigscript::StatusWrapper::StatusWrapper(const Sigmod::Status* status, SigmodWrapper* parent) : +Sigscript::StatusWrapper::StatusWrapper(const Sigmod::Status* status, GameWrapper* parent) : ObjectWrapper(status, parent), m_status(status) { diff --git a/sigscript/StatusWrapper.h b/sigscript/StatusWrapper.h index 61956234..ca3c8308 100644 --- a/sigscript/StatusWrapper.h +++ b/sigscript/StatusWrapper.h @@ -37,13 +37,13 @@ class SIGSCRIPT_EXPORT StatusWrapper : public ObjectWrapper Q_OBJECT public: - static StatusWrapper* create(const Sigmod::Status* status, SigmodWrapper* parent); + static StatusWrapper* create(const Sigmod::Status* status, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE Sigcore::Script battleScript() const; Q_SCRIPTABLE Sigcore::Script worldScript() const; private: - StatusWrapper(const Sigmod::Status* status, SigmodWrapper* parent); + StatusWrapper(const Sigmod::Status* status, GameWrapper* parent); StatusWrapper& operator=(const StatusWrapper& rhs); const Sigmod::Status* m_status; diff --git a/sigscript/StoreWrapper.cpp b/sigscript/StoreWrapper.cpp index 85d6b580..6d39513e 100644 --- a/sigscript/StoreWrapper.cpp +++ b/sigscript/StoreWrapper.cpp @@ -19,12 +19,12 @@ #include "StoreWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Store.h> -Sigscript::StoreWrapper* Sigscript::StoreWrapper::create(const Sigmod::Store* store, SigmodWrapper* parent) +Sigscript::StoreWrapper* Sigscript::StoreWrapper::create(const Sigmod::Store* store, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(store->className(), store->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::StoreWrapper* Sigscript::StoreWrapper::create(const Sigmod::Store* st return qobject_cast<StoreWrapper*>(m_instances[sig]); } -Sigscript::StoreWrapper::StoreWrapper(const Sigmod::Store* store, SigmodWrapper* parent) : +Sigscript::StoreWrapper::StoreWrapper(const Sigmod::Store* store, GameWrapper* parent) : ObjectWrapper(store, parent), m_store(store) { @@ -48,6 +48,6 @@ QList<Sigscript::ItemWrapper*> Sigscript::StoreWrapper::items() QList<int> itemIds = m_store->item(); QList<ItemWrapper*> items; foreach (int id, itemIds) - items.append(sigmod()->item(id)); + items.append(game()->item(id)); return items; } diff --git a/sigscript/StoreWrapper.h b/sigscript/StoreWrapper.h index f0683d4b..58867801 100644 --- a/sigscript/StoreWrapper.h +++ b/sigscript/StoreWrapper.h @@ -36,12 +36,12 @@ class SIGSCRIPT_EXPORT StoreWrapper : public ObjectWrapper Q_OBJECT public: - static StoreWrapper* create(const Sigmod::Store* store, SigmodWrapper* parent); + static StoreWrapper* create(const Sigmod::Store* store, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE QList<ItemWrapper*> items(); private: - StoreWrapper(const Sigmod::Store* store, SigmodWrapper* parent); + StoreWrapper(const Sigmod::Store* store, GameWrapper* parent); StoreWrapper& operator=(const StoreWrapper& rhs); const Sigmod::Store* m_store; diff --git a/sigscript/TileWrapper.cpp b/sigscript/TileWrapper.cpp index b131d6b1..549eff23 100644 --- a/sigscript/TileWrapper.cpp +++ b/sigscript/TileWrapper.cpp @@ -19,12 +19,12 @@ #include "TileWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Tile.h> -Sigscript::TileWrapper* Sigscript::TileWrapper::create(const Sigmod::Tile* tile, SigmodWrapper* parent) +Sigscript::TileWrapper* Sigscript::TileWrapper::create(const Sigmod::Tile* tile, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(tile->className(), tile->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::TileWrapper* Sigscript::TileWrapper::create(const Sigmod::Tile* tile, return qobject_cast<TileWrapper*>(m_instances[sig]); } -Sigscript::TileWrapper::TileWrapper(const Sigmod::Tile* tile, SigmodWrapper* parent) : +Sigscript::TileWrapper::TileWrapper(const Sigmod::Tile* tile, GameWrapper* parent) : ObjectWrapper(tile, parent), m_tile(tile) { diff --git a/sigscript/TileWrapper.h b/sigscript/TileWrapper.h index 882148f4..66e7a1d3 100644 --- a/sigscript/TileWrapper.h +++ b/sigscript/TileWrapper.h @@ -37,13 +37,13 @@ class SIGSCRIPT_EXPORT TileWrapper : public ObjectWrapper Q_OBJECT public: - static TileWrapper* create(const Sigmod::Tile* tile, SigmodWrapper* parent); + static TileWrapper* create(const Sigmod::Tile* tile, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE bool walkable() const; Q_SCRIPTABLE Sigcore::Script script() const; private: - TileWrapper(const Sigmod::Tile* tile, SigmodWrapper* parent); + TileWrapper(const Sigmod::Tile* tile, GameWrapper* parent); TileWrapper& operator=(const TileWrapper& rhs); const Sigmod::Tile* m_tile; diff --git a/sigscript/TimeWrapper.cpp b/sigscript/TimeWrapper.cpp index c034e4e5..656da86b 100644 --- a/sigscript/TimeWrapper.cpp +++ b/sigscript/TimeWrapper.cpp @@ -19,12 +19,12 @@ #include "TimeWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Time.h> -Sigscript::TimeWrapper* Sigscript::TimeWrapper::create(const Sigmod::Time* time, SigmodWrapper* parent) +Sigscript::TimeWrapper* Sigscript::TimeWrapper::create(const Sigmod::Time* time, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(time->className(), time->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::TimeWrapper* Sigscript::TimeWrapper::create(const Sigmod::Time* time, return qobject_cast<TimeWrapper*>(m_instances[sig]); } -Sigscript::TimeWrapper::TimeWrapper(const Sigmod::Time* time, SigmodWrapper* parent) : +Sigscript::TimeWrapper::TimeWrapper(const Sigmod::Time* time, GameWrapper* parent) : ObjectWrapper(time, parent), m_time(time) { diff --git a/sigscript/TimeWrapper.h b/sigscript/TimeWrapper.h index b65b937f..3aa5aeae 100644 --- a/sigscript/TimeWrapper.h +++ b/sigscript/TimeWrapper.h @@ -37,14 +37,14 @@ class SIGSCRIPT_EXPORT TimeWrapper : public ObjectWrapper Q_OBJECT public: - static TimeWrapper* create(const Sigmod::Time* time, SigmodWrapper* parent); + static TimeWrapper* create(const Sigmod::Time* time, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE int hour() const; Q_SCRIPTABLE int minute() const; Q_SCRIPTABLE Sigcore::Script script() const; private: - TimeWrapper(const Sigmod::Time* time, SigmodWrapper* parent); + TimeWrapper(const Sigmod::Time* time, GameWrapper* parent); TimeWrapper& operator=(const TimeWrapper& rhs); const Sigmod::Time* m_time; diff --git a/sigscript/TrainerWrapper.cpp b/sigscript/TrainerWrapper.cpp index 52a8f99b..ed7447b7 100644 --- a/sigscript/TrainerWrapper.cpp +++ b/sigscript/TrainerWrapper.cpp @@ -19,9 +19,9 @@ #include "TrainerWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" -Sigscript::TrainerWrapper* Sigscript::TrainerWrapper::create(const Sigmod::Trainer* trainer, SigmodWrapper* parent) +Sigscript::TrainerWrapper* Sigscript::TrainerWrapper::create(const Sigmod::Trainer* trainer, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(trainer->className(), trainer->id())); if (!m_instances.contains(sig)) @@ -29,7 +29,7 @@ Sigscript::TrainerWrapper* Sigscript::TrainerWrapper::create(const Sigmod::Train return qobject_cast<TrainerWrapper*>(m_instances[sig]); } -Sigscript::TrainerWrapper::TrainerWrapper(const Sigmod::Trainer* trainer, SigmodWrapper* parent) : +Sigscript::TrainerWrapper::TrainerWrapper(const Sigmod::Trainer* trainer, GameWrapper* parent) : ObjectWrapper(trainer, parent), m_trainer(trainer) { @@ -61,7 +61,7 @@ int Sigscript::TrainerWrapper::TrainerWrapper::moneyFactor() const Sigscript::SkinWrapper* Sigscript::TrainerWrapper::TrainerWrapper::skin() { - return sigmod()->skin(m_trainer->skin()); + return game()->skin(m_trainer->skin()); } int Sigscript::TrainerWrapper::TrainerWrapper::depth() const diff --git a/sigscript/TrainerWrapper.h b/sigscript/TrainerWrapper.h index f87eb1b0..85af25ac 100644 --- a/sigscript/TrainerWrapper.h +++ b/sigscript/TrainerWrapper.h @@ -34,7 +34,7 @@ class SIGSCRIPT_EXPORT TrainerWrapper : public ObjectWrapper Q_OBJECT public: - static TrainerWrapper* create(const Sigmod::Trainer* trainer, SigmodWrapper* parent); + static TrainerWrapper* create(const Sigmod::Trainer* trainer, GameWrapper* parent); Q_SCRIPTABLE Sigmod::Trainer::Intelligence intelligence(const QString& name) const; @@ -48,7 +48,7 @@ class SIGSCRIPT_EXPORT TrainerWrapper : public ObjectWrapper Q_SCRIPTABLE Sigmod::Trainer::Intelligence abilityIntel() const; Q_SCRIPTABLE Sigmod::Trainer::Intelligence statIntel() const; private: - TrainerWrapper(const Sigmod::Trainer* trainer, SigmodWrapper* parent); + TrainerWrapper(const Sigmod::Trainer* trainer, GameWrapper* parent); TrainerWrapper& operator=(const TrainerWrapper& rhs); const Sigmod::Trainer* m_trainer; diff --git a/sigscript/TypeWrapper.cpp b/sigscript/TypeWrapper.cpp index a0d0899e..dca07cb7 100644 --- a/sigscript/TypeWrapper.cpp +++ b/sigscript/TypeWrapper.cpp @@ -19,12 +19,12 @@ #include "TypeWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Type.h> -Sigscript::TypeWrapper* Sigscript::TypeWrapper::create(const Sigmod::Type* type, SigmodWrapper* parent) +Sigscript::TypeWrapper* Sigscript::TypeWrapper::create(const Sigmod::Type* type, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(type->className(), type->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::TypeWrapper* Sigscript::TypeWrapper::create(const Sigmod::Type* type, return qobject_cast<TypeWrapper*>(m_instances[sig]); } -Sigscript::TypeWrapper::TypeWrapper(const Sigmod::Type* type, SigmodWrapper* parent) : +Sigscript::TypeWrapper::TypeWrapper(const Sigmod::Type* type, GameWrapper* parent) : ObjectWrapper(type, parent), m_type(type) { diff --git a/sigscript/TypeWrapper.h b/sigscript/TypeWrapper.h index c65f3333..95e01a73 100644 --- a/sigscript/TypeWrapper.h +++ b/sigscript/TypeWrapper.h @@ -37,12 +37,12 @@ class SIGSCRIPT_EXPORT TypeWrapper : public ObjectWrapper Q_OBJECT public: - static TypeWrapper* create(const Sigmod::Type* type, SigmodWrapper* parent); + static TypeWrapper* create(const Sigmod::Type* type, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE Sigcore::Fraction stab() const; private: - TypeWrapper(const Sigmod::Type* type, SigmodWrapper* parent); + TypeWrapper(const Sigmod::Type* type, GameWrapper* parent); TypeWrapper& operator=(const TypeWrapper& rhs); const Sigmod::Type* m_type; diff --git a/sigscript/WeatherWrapper.cpp b/sigscript/WeatherWrapper.cpp index f6c25fe4..b995973d 100644 --- a/sigscript/WeatherWrapper.cpp +++ b/sigscript/WeatherWrapper.cpp @@ -19,12 +19,12 @@ #include "WeatherWrapper.h" // Sigscript includes -#include "SigmodWrapper.h" +#include "GameWrapper.h" // Sigmod includes #include <sigmod/Weather.h> -Sigscript::WeatherWrapper* Sigscript::WeatherWrapper::create(const Sigmod::Weather* weather, SigmodWrapper* parent) +Sigscript::WeatherWrapper* Sigscript::WeatherWrapper::create(const Sigmod::Weather* weather, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(weather->className(), weather->id())); if (!m_instances.contains(sig)) @@ -32,7 +32,7 @@ Sigscript::WeatherWrapper* Sigscript::WeatherWrapper::create(const Sigmod::Weath return qobject_cast<WeatherWrapper*>(m_instances[sig]); } -Sigscript::WeatherWrapper::WeatherWrapper(const Sigmod::Weather* weather, SigmodWrapper* parent) : +Sigscript::WeatherWrapper::WeatherWrapper(const Sigmod::Weather* weather, GameWrapper* parent) : ObjectWrapper(weather, parent), m_weather(weather) { diff --git a/sigscript/WeatherWrapper.h b/sigscript/WeatherWrapper.h index 2fd9a571..6e6a3ba7 100644 --- a/sigscript/WeatherWrapper.h +++ b/sigscript/WeatherWrapper.h @@ -37,12 +37,12 @@ class SIGSCRIPT_EXPORT WeatherWrapper : public ObjectWrapper Q_OBJECT public: - static WeatherWrapper* create(const Sigmod::Weather* weather, SigmodWrapper* parent); + static WeatherWrapper* create(const Sigmod::Weather* weather, GameWrapper* parent); Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE Sigcore::Script script() const; private: - WeatherWrapper(const Sigmod::Weather* weather, SigmodWrapper* parent); + WeatherWrapper(const Sigmod::Weather* weather, GameWrapper* parent); WeatherWrapper& operator=(const WeatherWrapper& rhs); const Sigmod::Weather* m_weather; |