summaryrefslogtreecommitdiffstats
path: root/sigbattle
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2009-01-10 18:05:23 -0500
committerBen Boeckel <MathStuf@gmail.com>2009-01-10 18:05:23 -0500
commit9834ea2f8f8ea736c53d9686393f50ccc72a982b (patch)
tree816facb7739452c6eeac98c2ccbb8d9d9401786a /sigbattle
parentd1eb604239e648cab0dc5dc0cc8b2e5bfa7e1e48 (diff)
downloadsigen-9834ea2f8f8ea736c53d9686393f50ccc72a982b.tar.gz
sigen-9834ea2f8f8ea736c53d9686393f50ccc72a982b.tar.xz
sigen-9834ea2f8f8ea736c53d9686393f50ccc72a982b.zip
Updated code to support new MapTrainerTeamMember item representation
Diffstat (limited to 'sigbattle')
-rw-r--r--sigbattle/TeamMember.cpp8
1 files changed, 7 insertions, 1 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());