From 6679f5cffa9d35a23b76605ddfbf3257f882b6ee Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 17 Apr 2008 23:34:36 +0000 Subject: [FIX] Frac -> Fraction [FIX] ImageCache and Ini removed [FIX] Fraction/Point widgets moved to pokemodr [FIX] Copy ctors made for pokemod classes [FIX] Ctors in pokemod fixed [FIX] Copyright headers fixed in pokemodr [FIX] PokeModr updated to new API and fixed in some places git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@99 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokemod/MapWarp.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pokemod/MapWarp.cpp') diff --git a/pokemod/MapWarp.cpp b/pokemod/MapWarp.cpp index d23db520..546984ff 100644 --- a/pokemod/MapWarp.cpp +++ b/pokemod/MapWarp.cpp @@ -25,6 +25,12 @@ const QStringList MapWarp::TypeStr = QStringList() << "Door/Stair" << "Warp Pad" << "Hole" << "Boundary"; +MapWarp::MapWarp(const MapWarp& warp) : + Object("MapWarp", warp.pokemod(), warp.id()) +{ + *this = warp; +} + MapWarp::MapWarp(const Pokemod* pokemod, const int id) : Object("MapWarp", pokemod, id), m_name(""), @@ -43,13 +49,13 @@ MapWarp::MapWarp(const Pokemod* pokemod, const int id) : m_from[i] = false; } -MapWarp::MapWarp(const Pokemod* pokemod, const MapWarp& warp, const int id) : +MapWarp::MapWarp(const MapWarp& warp, const Pokemod* pokemod, const int id) : Object("MapWarp", pokemod, id) { *this = warp; } -MapWarp::MapWarp(const Pokemod* pokemod, const QDomElement& xml, const int id) : +MapWarp::MapWarp(const QDomElement& xml, const Pokemod* pokemod, const int id) : Object("MapWarp", pokemod, id) { load(xml, id); -- cgit