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/Map.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pokemod/Map.cpp') diff --git a/pokemod/Map.cpp b/pokemod/Map.cpp index e3401e98..7a575271 100644 --- a/pokemod/Map.cpp +++ b/pokemod/Map.cpp @@ -699,15 +699,15 @@ Map& Map::operator=(const Map& rhs) tiles = rhs.tiles; effects.clear(); for (int i = 0; i < rhs.getEffectCount(); ++i) - newEffect(*rhs.getEffect(i)); + effects.append(MapEffect(pokemod, *rhs.getEffect(i), rhs.getEffect(i)->getId())); trainers.clear(); for (int i = 0; i < rhs.getTrainerCount(); ++i) - newTrainer(*rhs.getTrainer(i)); + trainers.append(MapTrainer(pokemod, *rhs.getTrainer(i), rhs.getTrainer(i)->getId())); warps.clear(); for (int i = 0; i < rhs.getWarpCount(); ++i) - newWarp(*rhs.getWarp(i)); + warps.append(MapWarp(pokemod, *rhs.getWarp(i), rhs.getWarp(i)->getId())); wildLists.clear(); for (int i = 0; i < rhs.getWildListCount(); ++i) - newWildList(*rhs.getWildList(i)); + wildLists.append(MapWildList(pokemod, *rhs.getWildList(i), rhs.getWildList(i)->getId())); return *this; } -- cgit