diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-11-08 06:15:08 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-11-08 06:15:08 +0000 |
| commit | 8bad37e82371bd41864903ac0d6f49808ad119bf (patch) | |
| tree | 77f0cb46059654cefb357d6eb4064c5740edf3d4 /sigmodr/MapTrainerUI.cpp | |
| parent | c127c0dae65a7600e0ab30b634f25d4915c61d16 (diff) | |
| download | sigen-8bad37e82371bd41864903ac0d6f49808ad119bf.tar.gz sigen-8bad37e82371bd41864903ac0d6f49808ad119bf.tar.xz sigen-8bad37e82371bd41864903ac0d6f49808ad119bf.zip | |
[FIX] No more asserts in sigmod
[FIX] Moved to using *ById instead of *Index methods in sigmod
[FIX] Tilemaps are now collaged (not completely done on the editing side yet)
[FIX] Removed the resource files (drawn natively instead)
[FIX] ATBTimer now uses the built-in QTimer in a QObject
[FIX] Coordinates are now edited on the map for warps, trainers, and effects
[FIX] Tiles are now completely scripted
[FIX] Config is now thread-safe
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@308 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'sigmodr/MapTrainerUI.cpp')
| -rw-r--r-- | sigmodr/MapTrainerUI.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sigmodr/MapTrainerUI.cpp b/sigmodr/MapTrainerUI.cpp index e18e7900..73a79537 100644 --- a/sigmodr/MapTrainerUI.cpp +++ b/sigmodr/MapTrainerUI.cpp @@ -19,7 +19,6 @@ #include "MapTrainerUI.h" // Sigmod includes -#include "../sigmod/Map.h" #include "../sigmod/MapTrainer.h" #include "../sigmod/MapTrainerTeamMember.h" #include "../sigmod/Rules.h" @@ -48,8 +47,6 @@ void Sigmodr::MapTrainerUI::refreshGui() varTrainerClass->addItem(trainer->name(), trainer->id()); } varTrainerClass->blockSignals(blockedTrainerClass); - const Sigmod::Map* map = qobject_cast<const Sigmod::Map*>(original()->parent()); - varCoordinate->setMaximum(QPoint(map->width(), map->height())); varNumberFight->setMaximum(sigmod()->rules()->maxFight()); const bool blockedLeadTeamMember = varLeadTeamMember->blockSignals(true); varLeadTeamMember->clear(); @@ -67,7 +64,6 @@ void Sigmodr::MapTrainerUI::setGui() { varName->setText(qobject_cast<Sigmod::MapTrainer*>(modified())->name()); varTrainerClass->setCurrentIndex(varTrainerClass->findData(qobject_cast<Sigmod::MapTrainer*>(modified())->trainerClass())); - varCoordinate->setValue(qobject_cast<Sigmod::MapTrainer*>(modified())->coordinate()); varNumberFight->setValue(qobject_cast<Sigmod::MapTrainer*>(modified())->numberFight()); varScript->setValue(qobject_cast<Sigmod::MapTrainer*>(modified())->script()); varLeadTeamMember->setCurrentIndex(varLeadTeamMember->findData(qobject_cast<Sigmod::MapTrainer*>(modified())->leadTeamMember())); @@ -98,11 +94,6 @@ void Sigmodr::MapTrainerUI::on_varTrainerClass_activated(const int trainerClass) qobject_cast<Sigmod::MapTrainer*>(modified())->setTrainerClass(varTrainerClass->itemData(trainerClass).toInt()); } -void Sigmodr::MapTrainerUI::on_varCoordinate_valueChanged(const QPoint& coordinate) -{ - qobject_cast<Sigmod::MapTrainer*>(modified())->setCoordinate(coordinate); -} - void Sigmodr::MapTrainerUI::on_varNumberFight_valueChanged(const int numberFight) { qobject_cast<Sigmod::MapTrainer*>(modified())->setNumberFight(numberFight); |