summaryrefslogtreecommitdiffstats
path: root/pokemod/MapWildList.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-04-17 23:34:36 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-04-17 23:34:36 +0000
commit6679f5cffa9d35a23b76605ddfbf3257f882b6ee (patch)
treec8e41854a60b64e8569939bca6b827807175ef9a /pokemod/MapWildList.cpp
parent05980e883719b1c8ebde1bd2fcbf4f8c16df7ad6 (diff)
downloadsigen-6679f5cffa9d35a23b76605ddfbf3257f882b6ee.tar.gz
sigen-6679f5cffa9d35a23b76605ddfbf3257f882b6ee.tar.xz
sigen-6679f5cffa9d35a23b76605ddfbf3257f882b6ee.zip
[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/MapWildList.cpp')
-rw-r--r--pokemod/MapWildList.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/pokemod/MapWildList.cpp b/pokemod/MapWildList.cpp
index 52a1dc78..07cd46ec 100644
--- a/pokemod/MapWildList.cpp
+++ b/pokemod/MapWildList.cpp
@@ -16,7 +16,6 @@
*/
// Qt includes
-#include <QDir>
#include <QMap>
// Pokemod includes
@@ -30,6 +29,12 @@
const QStringList MapWildList::ControlStr = QStringList() << "Grass" << "Surfing" << "Fishing" << "Dive" << "Headbutt" << "Rock Smash";
+MapWildList::MapWildList(const MapWildList& wildList) :
+ Object("MapWildList", wildList.pokemod(), wildList.id())
+{
+ *this = wildList;
+}
+
MapWildList::MapWildList(const Pokemod* pokemod, const int id) :
Object("MapWildList", pokemod, id),
m_control(INT_MAX),
@@ -38,13 +43,13 @@ MapWildList::MapWildList(const Pokemod* pokemod, const int id) :
{
}
-MapWildList::MapWildList(const Pokemod* pokemod, const MapWildList& wildList, const int id) :
+MapWildList::MapWildList(const MapWildList& wildList, const Pokemod* pokemod, const int id) :
Object("MapWildList", pokemod, id)
{
*this = wildList;
}
-MapWildList::MapWildList(const Pokemod* pokemod, const QDomElement& xml, const int id) :
+MapWildList::MapWildList(const QDomElement& xml, const Pokemod* pokemod, const int id) :
Object("MapWildList", pokemod, id)
{
load(xml, id);
@@ -280,13 +285,13 @@ MapWildListEncounter* MapWildList::newEncounter()
MapWildListEncounter* MapWildList::newEncounter(const QDomElement& xml)
{
- m_encounters.append(new MapWildListEncounter(pokemod(), xml, newEncounterId()));
+ m_encounters.append(new MapWildListEncounter(xml, pokemod(), newEncounterId()));
return m_encounters[encounterCount() - 1];
}
MapWildListEncounter* MapWildList::newEncounter(const MapWildListEncounter& encounter)
{
- m_encounters.append(new MapWildListEncounter(pokemod(), encounter, newEncounterId()));
+ m_encounters.append(new MapWildListEncounter(encounter, pokemod(), newEncounterId()));
return m_encounters[encounterCount() - 1];
}