summaryrefslogtreecommitdiffstats
path: root/pokemod/Dialog.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/Dialog.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/Dialog.cpp')
-rw-r--r--pokemod/Dialog.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/pokemod/Dialog.cpp b/pokemod/Dialog.cpp
index 01463a48..58252431 100644
--- a/pokemod/Dialog.cpp
+++ b/pokemod/Dialog.cpp
@@ -33,19 +33,25 @@ const QStringList Dialog::CommandStr = QStringList() << "Flip Flag" << "Set Flag
const QStringList Dialog::CommandAbbrStr = QStringList() << "FF" << "SF" << "UF" << "RF" << "TF" << "D" << "YN" << "ItS" << "GIt" << "TIt" << "CIt" << "CL" << "TMv" << "DMv" << "GPk" << "TPk" << "SPk" << "VPk" << "G$" << "T$" << "MvEf" << "TEf" << "CD" << "CR" << "CLv" << "CS" << "CHIt" << "C$" << "T" << "Dc" << "Bat" << "Bdg" << "W" << "N" << "Ms" << "SFX" << "Tmr" << "MS" << "WS" << "S" << "HP" << "R" << "C" << "P" << "NL" << "X" << "M";
const QList<int> Dialog::CommandNumArgs = QList<int>() << 1 << 1 << 1 << 1 << 3 << 2 << 2 << 1 << 4 << 4 << 4 << 1 << 5 << 3 << 7 << 4 << 1 << 4 << 1 << 4 << 6 << 3 << 6 << 5 << 5 << 4 << 4 << 5 << 6 << 1 << 2 << 1 << 2 << 1 << 2 << 1 << 3 << 1 << 1 << 3 << 0 << 0 << 0 << 0 << 0 << 0;
+Dialog::Dialog(const Dialog& dialog) :
+ Object("Dialog", dialog.pokemod(), dialog.id())
+{
+ *this = dialog;
+}
+
Dialog::Dialog(const Pokemod* pokemod, const int id) :
Object("Dialog", pokemod, id),
m_dialog("")
{
}
-Dialog::Dialog(const Pokemod* pokemod, const Dialog& dialog, const int id) :
+Dialog::Dialog(const Dialog& dialog, const Pokemod* pokemod, const int id) :
Object("Dialog", pokemod, id)
{
*this = dialog;
}
-Dialog::Dialog(const Pokemod* pokemod, const QDomElement& xml, const int id) :
+Dialog::Dialog(const QDomElement& xml, const Pokemod* pokemod, const int id) :
Object("Dialog", pokemod, id)
{
load(xml, id);