diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-06-30 01:37:51 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-06-30 01:37:51 +0000 |
| commit | a423cf3db8fa90cc09d2f92ff892e4fcdda4af16 (patch) | |
| tree | 174b821adc5e089a313657499e0df740d7184fca /pokemod/MapTrainer.cpp | |
| parent | 300e44b68e075d7fd78287e10262b0d502f4898d (diff) | |
| download | sigen-a423cf3db8fa90cc09d2f92ff892e4fcdda4af16.tar.gz sigen-a423cf3db8fa90cc09d2f92ff892e4fcdda4af16.tar.xz sigen-a423cf3db8fa90cc09d2f92ff892e4fcdda4af16.zip | |
[FIX] Replaced Point with QPoint (less duplicate code)
[FIX] Fraction and Point widgets are more compact
[FIX] Fleshed out more of the TeamMember
[FIX] Map tilemap editor now expands to fill all available area
[FIX] Added priority values to abilities and moves
[FIX] Added option for ATB-like battle rounds
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@217 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/MapTrainer.cpp')
| -rw-r--r-- | pokemod/MapTrainer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp index 31507ec5..d16ab3c0 100644 --- a/pokemod/MapTrainer.cpp +++ b/pokemod/MapTrainer.cpp @@ -86,7 +86,7 @@ void Pokemod::MapTrainer::load(const QDomElement& xml) LOAD_BEGIN(); LOAD(QString, name); LOAD(int, trainerClass); - LOAD(Point, coordinate); + LOAD(QPoint, coordinate); LOAD(int, numberFight); LOAD(Script, script); LOAD_SUB(newTeamMember, MapTrainerTeamMember); @@ -98,7 +98,7 @@ QDomElement Pokemod::MapTrainer::save() const SAVE_CREATE(); SAVE(QString, name); SAVE(int, trainerClass); - SAVE(Point, coordinate); + SAVE(QPoint, coordinate); SAVE(int, numberFight); SAVE(Script, script); SAVE_SUB(MapTrainerTeamMember, teamMembers); @@ -120,7 +120,7 @@ void Pokemod::MapTrainer::setTrainerClass(const int trainerClass) CHECK(trainerClass); } -void Pokemod::MapTrainer::setCoordinate(const Point& coordinate) +void Pokemod::MapTrainer::setCoordinate(const QPoint& coordinate) { if ((static_cast<const Map*>(parent())->width() <= coordinate.x()) || (static_cast<const Map*>(parent())->height() <= coordinate.y())) { @@ -165,7 +165,7 @@ int Pokemod::MapTrainer::trainerClass() const return m_trainerClass; } -Pokemod::Point Pokemod::MapTrainer::coordinate() const +QPoint Pokemod::MapTrainer::coordinate() const { return m_coordinate; } |