diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-01-10 18:05:23 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-01-10 18:05:23 -0500 |
| commit | 9834ea2f8f8ea736c53d9686393f50ccc72a982b (patch) | |
| tree | 816facb7739452c6eeac98c2ccbb8d9d9401786a | |
| parent | d1eb604239e648cab0dc5dc0cc8b2e5bfa7e1e48 (diff) | |
| download | sigen-9834ea2f8f8ea736c53d9686393f50ccc72a982b.tar.gz sigen-9834ea2f8f8ea736c53d9686393f50ccc72a982b.tar.xz sigen-9834ea2f8f8ea736c53d9686393f50ccc72a982b.zip | |
Updated code to support new MapTrainerTeamMember item representation
| -rw-r--r-- | sigbattle/TeamMember.cpp | 8 | ||||
| -rw-r--r-- | sigmodr/MapTrainerTeamMemberUI.cpp | 2 | ||||
| -rw-r--r-- | sigscript/MapTrainerTeamMemberWrapper.cpp | 9 | ||||
| -rw-r--r-- | sigscript/MapTrainerTeamMemberWrapper.h | 2 |
4 files changed, 15 insertions, 6 deletions
diff --git a/sigbattle/TeamMember.cpp b/sigbattle/TeamMember.cpp index 7bdff1d8..afaa9cfb 100644 --- a/sigbattle/TeamMember.cpp +++ b/sigbattle/TeamMember.cpp @@ -138,7 +138,13 @@ Sigbattle::TeamMember::TeamMember(Sigscript::MapTrainerTeamMemberWrapper* teamMe setSpecies(teamMember->species()); setName(m_species->name()); setLevel(teamMember->level()); - m_items = teamMember->items(); + const QMap<Sigscript::ItemWrapper*, int>& itemMap = teamMember->items(); + QList<Sigscript::ItemWrapper*> items = itemMap.keys(); + foreach (Sigscript::ItemWrapper* item, items) + { + for (int i = 0; i < itemMap[item]; ++i) + m_items.append(item); + } initAbilities(teamMember->abilities()); initMoves(teamMember->moves()); initNatures(teamMember->natures()); diff --git a/sigmodr/MapTrainerTeamMemberUI.cpp b/sigmodr/MapTrainerTeamMemberUI.cpp index 275b135d..6491adeb 100644 --- a/sigmodr/MapTrainerTeamMemberUI.cpp +++ b/sigmodr/MapTrainerTeamMemberUI.cpp @@ -28,6 +28,8 @@ #include "../sigmod/Sigmod.h" #include "../sigmod/Species.h" +// FIXME: Update GUI to new item storage + Sigmodr::MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(Sigmod::MapTrainerTeamMember* teamMember, QWidget* parent) : ObjectUI(parent) { diff --git a/sigscript/MapTrainerTeamMemberWrapper.cpp b/sigscript/MapTrainerTeamMemberWrapper.cpp index 6309c1d7..d7b97cc4 100644 --- a/sigscript/MapTrainerTeamMemberWrapper.cpp +++ b/sigscript/MapTrainerTeamMemberWrapper.cpp @@ -56,12 +56,13 @@ QList<Sigscript::AbilityWrapper*> Sigscript::MapTrainerTeamMemberWrapper::abilit return abilities; } -QList<Sigscript::ItemWrapper*> Sigscript::MapTrainerTeamMemberWrapper::items() +QMap<Sigscript::ItemWrapper*, int> Sigscript::MapTrainerTeamMemberWrapper::items() { - QList<int> itemIds = m_teamMember->item(); - QList<ItemWrapper*> items; + const QMap<int, int>& itemMap = m_teamMember->item(); + QList<int> itemIds = itemMap.keys(); + QMap<ItemWrapper*, int> items; foreach (int id, itemIds) - items.append(sigmod()->item(id)); + items[sigmod()->item(id)] = itemMap[id]; return items; } diff --git a/sigscript/MapTrainerTeamMemberWrapper.h b/sigscript/MapTrainerTeamMemberWrapper.h index f39259d5..e7c33235 100644 --- a/sigscript/MapTrainerTeamMemberWrapper.h +++ b/sigscript/MapTrainerTeamMemberWrapper.h @@ -44,7 +44,7 @@ class SIGSCRIPT_EXPORT MapTrainerTeamMemberWrapper : public ObjectWrapper Q_SCRIPTABLE SpeciesWrapper* species(); Q_SCRIPTABLE int level() const; Q_SCRIPTABLE QList<AbilityWrapper*> abilities(); - Q_SCRIPTABLE QList<ItemWrapper*> items(); + Q_SCRIPTABLE QMap<ItemWrapper*, int> items(); Q_SCRIPTABLE QList<MoveWrapper*> moves(); Q_SCRIPTABLE QList<NatureWrapper*> natures(); private: |