[FIX] SoundUI uses correct icon names now

[FIX] Setting up combo boxes in UI widgets cleaner
[ADD] AbilityEffect widget done
[FIX] Fixed up MapEffect setting code

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@142 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 2 insertions, 4 deletions

diff --git a/pokemodr/MapTrainerTeamMemberUI.cpp b/pokemodr/MapTrainerTeamMemberUI.cpp
index 65b9e802..d2489dc9 100644
--- a/pokemodr/MapTrainerTeamMemberUI.cpp
+++ b/pokemodr/MapTrainerTeamMemberUI.cpp
@@ -44,8 +44,7 @@ void MapTrainerTeamMemberUI::refreshGui()
     for (int i = 0; i < static_cast<const Pokemod*>(original()->pokemod())->speciesCount(); ++i)
     {
         const Species* species = static_cast<const Pokemod*>(original()->pokemod())->species(i);
-        varSpecies->addItem(species->name());
-        varSpecies->setItemData(i, species->id());
+        varSpecies->addItem(species->name(), species->id());
     }
     varLevel->setMaximum(static_cast<const Pokemod*>(original()->pokemod())->rules()->maxLevel());
 }
@@ -66,8 +65,7 @@ void MapTrainerTeamMemberUI::setGui()
         for (int i = 0; i < static_cast<const Pokemod*>(original()->pokemod())->natureCount(); ++i)
         {
             const Nature* nature = static_cast<const Pokemod*>(original()->pokemod())->nature(i);
-            varNature->addItem(nature->name());
-            varNature->setItemData(i, nature->id());
+            varNature->addItem(nature->name(), nature->id());
         }
     }
     else