diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-02-23 00:30:00 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-02-23 00:30:00 +0000 |
| commit | 9cd7f4656b01cfb243433e1063c0339b2b96bbd4 (patch) | |
| tree | b3faeacc636f956013e2972b950a2c1b9cd85f59 /pokemod/MapTrainer.cpp | |
| parent | 0ee1ea1cef9eec7e0187aa9f8f2dc291775e8864 (diff) | |
| download | sigen-9cd7f4656b01cfb243433e1063c0339b2b96bbd4.tar.gz sigen-9cd7f4656b01cfb243433e1063c0339b2b96bbd4.tar.xz sigen-9cd7f4656b01cfb243433e1063c0339b2b96bbd4.zip | |
[FIX] Changelog/SVN desynchronization fixed
[FIX] skins UI file cleaned up
[FIX] ImageCache no longer uses force argument
[FIX] operator= now correctly copies subdata from rhs (instead of reassigning ID numbers)
[FIX] Pokemod can now be copied
[FIX] Pokemod skin calls cleaned up
[ADD] PokemodUI.{h, cpp}
[ADD] SkinsUI.{h, cpp}
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@70 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/MapTrainer.cpp')
| -rw-r--r-- | pokemod/MapTrainer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp index 810692f5..306b50ec 100644 --- a/pokemod/MapTrainer.cpp +++ b/pokemod/MapTrainer.cpp @@ -444,6 +444,6 @@ MapTrainer& MapTrainer::operator=(const MapTrainer& rhs) leadTeamMember = rhs.leadTeamMember; teamMembers.clear(); for (int i = 0; i < rhs.getTeamMemberCount(); ++i) - newTeamMember(*rhs.getTeamMember(i)); + teamMembers.append(MapTrainerTeamMember(pokemod, *rhs.getTeamMember(i), rhs.getTeamMember(i)->getId())); return *this; } |