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/Dialog.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pokemod/Dialog.cpp') 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 Dialog::CommandNumArgs = QList() << 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); -- cgit