From f3b3f21d3ba0fd48bc265684817cb38a70adf84b Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 25 Dec 2008 07:53:09 -0500 Subject: Bounds errors are verbose now and some unchecked conditions fixed as well --- sigmod/MapTrainer.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sigmod/MapTrainer.cpp') diff --git a/sigmod/MapTrainer.cpp b/sigmod/MapTrainer.cpp index 1722df8d..b4b5fa33 100644 --- a/sigmod/MapTrainer.cpp +++ b/sigmod/MapTrainer.cpp @@ -113,7 +113,7 @@ void Sigmod::MapTrainer::setName(const QString& name) void Sigmod::MapTrainer::setTrainerClass(const int trainerClass) { if (!sigmod()->trainerById(trainerClass)) - emit(error(bounds("trainerClass"))); + emit(error(bounds("trainerClass", trainerClass))); else CHECK(trainerClass); } @@ -121,16 +121,16 @@ void Sigmod::MapTrainer::setTrainerClass(const int trainerClass) void Sigmod::MapTrainer::setCoordinate(const QPoint& coordinate) { const Map* map = qobject_cast(parent()); - if ((map->width() <= coordinate.x()) || (map->height() <= coordinate.y())) - emit(error(bounds("coordinate"))); + if ((coordinate.x() < 0) || (coordinate.y() < 0) || (map->width() <= coordinate.x()) || (map->height() <= coordinate.y())) + emit(error(bounds("coordinate", QPoint(0, 0), QPoint(map->width(), map->height()), coordinate))); else CHECK(coordinate); } void Sigmod::MapTrainer::setNumberFight(const int numberFight) { - if (!numberFight || (sigmod()->rules()->maxFight() < numberFight)) - emit(error(bounds("numberFight"))); + if ((numberFight <= 0) || (sigmod()->rules()->maxFight() < numberFight)) + emit(error(bounds("numberFight", 1, sigmod()->rules()->maxFight(), numberFight))); else CHECK(numberFight); } @@ -143,7 +143,7 @@ void Sigmod::MapTrainer::setScript(const Sigcore::Script& script) void Sigmod::MapTrainer::setLeadTeamMember(const int leadTeamMember) { if (!teamMemberById(leadTeamMember)) - emit(error(bounds("leadTeamMember"))); + emit(error(bounds("leadTeamMember", leadTeamMember))); else CHECK(leadTeamMember); } -- cgit