1 files changed, 8 insertions, 24 deletions

diff --git a/pokemod/MapTrainerTeamMember.cpp b/pokemod/MapTrainerTeamMember.cpp
index 762d0208..33bf2f7c 100644
--- a/pokemod/MapTrainerTeamMember.cpp
+++ b/pokemod/MapTrainerTeamMember.cpp
@@ -102,31 +102,24 @@ QDomElement Pokemod::MapTrainerTeamMember::save() const
 void Pokemod::MapTrainerTeamMember::setSpecies(const int species)
 {
     if (qobject_cast<const Pokemod*>(pokemod())->speciesIndex(species) == INT_MAX)
-    {
         emit(error(bounds("species")));
-        return;
-    }
-    CHECK(species);
+    else
+        CHECK(species);
 }
 
 void Pokemod::MapTrainerTeamMember::setLevel(const int level)
 {
     if (qobject_cast<const Pokemod*>(pokemod())->rules()->maxLevel() < level)
-    {
         emit(error(bounds("level")));
-        return;
-    }
-    CHECK(level);
+    else
+        CHECK(level);
 }
 
 void Pokemod::MapTrainerTeamMember::setAbility(const int ability, const bool state)
 {
     if (qobject_cast<const Pokemod*>(pokemod())->abilityIndex(ability) == INT_MAX)
-    {
         emit(error(bounds("ability")));
-        return;
-    }
-    if (state && !m_ability.contains(ability))
+    else if (state && !m_ability.contains(ability))
     {
         if (m_ability.size() < qobject_cast<const Pokemod*>(pokemod())->rules()->maxAbilities())
         {
@@ -146,11 +139,8 @@ void Pokemod::MapTrainerTeamMember::setAbility(const int ability, const bool sta
 void Pokemod::MapTrainerTeamMember::setItem(const int item, const bool state)
 {
     if (qobject_cast<const Pokemod*>(pokemod())->itemIndex(item) == INT_MAX)
-    {
         emit(error(bounds("item")));
-        return;
-    }
-    if (state && !m_item.contains(item))
+    else if (state && !m_item.contains(item))
     {
         if (m_item.size() < qobject_cast<const Pokemod*>(pokemod())->rules()->maxHeldItems())
         {
@@ -170,11 +160,8 @@ void Pokemod::MapTrainerTeamMember::setItem(const int item, const bool state)
 void Pokemod::MapTrainerTeamMember::setMove(const int move, const bool state)
 {
     if (qobject_cast<const Pokemod*>(pokemod())->moveIndex(move) == INT_MAX)
-    {
         emit(error(bounds("move")));
-        return;
-    }
-    if (state && !m_move.contains(move))
+    else if (state && !m_move.contains(move))
     {
         const Species* species = qobject_cast<const Pokemod*>(pokemod())->speciesById(move);
         for (int i = 0; i < species->moveCount(); ++i)
@@ -204,11 +191,8 @@ void Pokemod::MapTrainerTeamMember::setMove(const int move, const bool state)
 void Pokemod::MapTrainerTeamMember::setNature(const int nature, const bool state)
 {
     if (qobject_cast<const Pokemod*>(pokemod())->natureIndex(nature) == INT_MAX)
-    {
         emit(error(bounds("nature")));
-        return;
-    }
-    if (state && !m_nature.contains(nature))
+    else if (state && !m_nature.contains(nature))
     {
         if (m_nature.size() < qobject_cast<const Pokemod*>(pokemod())->rules()->maxNatures())
         {