From 9cd7f4656b01cfb243433e1063c0339b2b96bbd4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 23 Feb 2008 00:30:00 +0000 Subject: [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 --- pokemod/MapTrainer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pokemod/MapTrainer.cpp') 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; } -- cgit