diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-05-27 14:04:01 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-05-27 14:04:01 +0000 |
| commit | 8cbe19a3e1845657ccdfddbd3c4fffcaadb9ff55 (patch) | |
| tree | 72b3f2d493d1cfc76814a27c3df3d7dabdee8d29 /pokemod | |
| parent | 00fecef0aebaa379dfc176ddc5d6488fae0e8272 (diff) | |
[FIX] Item widget works better
[FIX] FractionWidget value is updated at ctor
[FIX] Non-script KTextEdit is now a KLineEdit
[FIX] Rules not being set
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@179 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod')
| -rw-r--r-- | pokemod/Object.h | 4 | ||||
| -rw-r--r-- | pokemod/Pokemod.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pokemod/Object.h b/pokemod/Object.h index 0a1cab43..503d562e 100644 --- a/pokemod/Object.h +++ b/pokemod/Object.h @@ -91,7 +91,7 @@ class Object : public QObject // FIXME: QPixmap::fromData static member would be nice #define LOAD_QPixmap(node) QPixmap::fromImage(QImage::fromData(QByteArray::fromBase64(LOAD_DATA(node).toUtf8()))) #define LOAD_QByteArray(node) QByteArray::fromBase64(LOAD_DATA(node).toUtf8()) -#define LOAD_Rules() m_rules = new Rules(xml.firstChildElement("Rules"), this) +#define LOAD_Rules() m_rules->load(xml.firstChildElement("Rules")) #define LOAD_Script(node) Script(node.attribute("interpreter", ""), LOAD_DATA(node)) #define LOAD_ARRAY(type, variable, size) \ QDomElement xml_##variable = LOAD_NODE(#variable).firstChildElement("element"); \ @@ -208,7 +208,7 @@ class Object : public QObject xml.appendChild(sub->save()) #define COPY(variable) m_##variable = rhs.m_##variable -#define COPY_Rules(variable) *m_##variable= *rhs.m_##variable +#define COPY_Rules(variable) *m_##variable = *rhs.m_##variable #define COPY_ARRAY(variable, size) \ for (int i = 0; i < size; ++i) \ COPY(variable[i]) diff --git a/pokemod/Pokemod.cpp b/pokemod/Pokemod.cpp index 6a76b081..414cb578 100644 --- a/pokemod/Pokemod.cpp +++ b/pokemod/Pokemod.cpp @@ -2440,7 +2440,6 @@ Pokemod& Pokemod::operator=(const Pokemod& rhs) void Pokemod::clear() { - delete m_rules; while (abilityCount()) deleteAbility(0); while (authorCount()) |