diff options
author | Ben Boeckel <MathStuf@gmail.com> | 2008-04-27 15:15:17 +0000 |
---|---|---|
committer | Ben Boeckel <MathStuf@gmail.com> | 2008-04-27 15:15:17 +0000 |
commit | 807071d35159de0660f9df31c48d5bf895ca3622 (patch) | |
tree | a1e9dbdc1e58b91cd2e4a5e472597b0204ccb41d /pokemod/Tile.h | |
parent | f444f5a45e9325644a360f656176d47d7f540f52 (diff) | |
download | sigen-807071d35159de0660f9df31c48d5bf895ca3622.tar.gz sigen-807071d35159de0660f9df31c48d5bf895ca3622.tar.xz sigen-807071d35159de0660f9df31c48d5bf895ca3622.zip |
[FIX] Pokemod objects now know about parents
[FIX] Project includes are now relative
[FIX] Headers included for better detection of invalid headers
[FIX] Validation code commented out so it can be done better
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@111 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/Tile.h')
-rw-r--r-- | pokemod/Tile.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pokemod/Tile.h b/pokemod/Tile.h index f64a10c7..0438cade 100644 --- a/pokemod/Tile.h +++ b/pokemod/Tile.h @@ -18,18 +18,17 @@ #ifndef __POKEMOD_TILE__ #define __POKEMOD_TILE__ -// Qt includes -#include <QString> -#include <QStringList> - -// General includes -#include <Exception.h> -#include <Fraction.h> - // Pokemod includes #include "Object.h" #include "Pokemod.h" +// General includes +#include "../general/Exception.h" +#include "../general/Fraction.h" + +// Qt includes +#include <QString> + class Tile : public Object { public: @@ -44,9 +43,9 @@ class Tile : public Object static const QStringList ForceStr; Tile(const Tile& tile); - Tile(const Pokemod* pokemod, const int id); - Tile(const Tile& tile, const Pokemod* pokemod, const int id); - Tile(const QDomElement& xml, const Pokemod* pokemod, const int id = INT_MAX); + Tile(const Object* parent, const int id); + Tile(const Tile& tile, const Object* parent, const int id); + Tile(const QDomElement& xml, const Object* parent, const int id = INT_MAX); void load(const QDomElement& xml, int id = INT_MAX); QDomElement save() const; |