diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-04-17 23:34:36 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-04-17 23:34:36 +0000 |
| commit | 6679f5cffa9d35a23b76605ddfbf3257f882b6ee (patch) | |
| tree | c8e41854a60b64e8569939bca6b827807175ef9a /pokemod/MapWarp.cpp | |
| parent | 05980e883719b1c8ebde1bd2fcbf4f8c16df7ad6 (diff) | |
[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
Diffstat (limited to 'pokemod/MapWarp.cpp')
| -rw-r--r-- | pokemod/MapWarp.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
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); |
