summaryrefslogtreecommitdiffstats
path: root/pokemod/Tile.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'pokemod/Tile.cpp')
-rw-r--r--pokemod/Tile.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/pokemod/Tile.cpp b/pokemod/Tile.cpp
index 2eb80173..ba6bb9ab 100644
--- a/pokemod/Tile.cpp
+++ b/pokemod/Tile.cpp
@@ -26,6 +26,12 @@
const QStringList Tile::ForceStr = QStringList() << "Slip" << "Stop" << "Force" << "Push";
+Tile::Tile(const Tile& tile) :
+ Object("Tile", tile.pokemod(), tile.id())
+{
+ *this = tile;
+}
+
Tile::Tile(const Pokemod* pokemod, const int id) :
Object("Tile", pokemod, id),
m_name(""),
@@ -39,13 +45,13 @@ Tile::Tile(const Pokemod* pokemod, const int id) :
m_from[i] = false;
}
-Tile::Tile(const Pokemod* pokemod, const Tile& tile, const int id) :
+Tile::Tile(const Tile& tile, const Pokemod* pokemod, const int id) :
Object("Tile", pokemod, id)
{
*this = tile;
}
-Tile::Tile(const Pokemod* pokemod, const QDomElement& xml, const int id) :
+Tile::Tile(const QDomElement& xml, const Pokemod* pokemod, const int id) :
Object("Tile", pokemod, id)
{
load(xml, id);
@@ -102,7 +108,7 @@ void Tile::load(const QDomElement& xml, int id)
LOAD(QString, name);
LOAD(QPixmap, sprite);
LOAD_ARRAY(bool, from, Pokemod::D_End);
- LOAD(Frac, wildChance);
+ LOAD(Fraction, wildChance);
LOAD(int, hmType);
LOAD(int, under);
LOAD(int, forceType);
@@ -115,7 +121,7 @@ QDomElement Tile::save() const
SAVE(QString, name);
SAVE(QPixmap, sprite);
SAVE_ARRAY(bool, from, Pokemod::D_End);
- SAVE(Frac, wildChance);
+ SAVE(Fraction, wildChance);
SAVE(int, hmType);
SAVE(int, under);
SAVE(int, forceType);
@@ -141,7 +147,7 @@ void Tile::setFrom(const int direction, const bool state) throw(BoundsException)
m_from[direction] = state;
}
-void Tile::setWildChance(const Frac& wildChance) throw(Exception)
+void Tile::setWildChance(const Fraction& wildChance) throw(Exception)
{
m_wildChance = wildChance;
}
@@ -202,7 +208,7 @@ bool Tile::from(const int direction) const throw(BoundsException)
return m_from[direction];
}
-Frac Tile::wildChance() const
+Fraction Tile::wildChance() const
{
return m_wildChance;
}