[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, 3 insertions, 6 deletions

diff --git a/pokemodr/MapWarpUI.cpp b/pokemodr/MapWarpUI.cpp
index d3403672..5e902c8e 100644
--- a/pokemodr/MapWarpUI.cpp
+++ b/pokemodr/MapWarpUI.cpp
@@ -51,15 +51,13 @@ void MapWarpUI::refreshGui()
     for (int i = 0; i < static_cast<const Pokemod*>(original()->pokemod())->mapCount(); ++i)
     {
         const Map* map = static_cast<const Pokemod*>(original()->pokemod())->map(i);
-        varToMap->addItem(map->name());
-        varToMap->setItemData(i, map->id());
+        varToMap->addItem(map->name(), map->id());
     }
     varDialog->clear();
     for (int i = 0; i < static_cast<const Pokemod*>(original()->pokemod())->dialogCount(); ++i)
     {
         const Dialog* dialog = static_cast<const Pokemod*>(original()->pokemod())->dialog(i);
-        varDialog->addItem(dialog->dialog().mid(0, 25));
-        varDialog->setItemData(i, dialog->id());
+        varDialog->addItem(dialog->dialog().mid(0, 25), dialog->id());
     }
 }
 
@@ -87,8 +85,7 @@ void MapWarpUI::setGui()
             for (int i = 0; i < map->warpCount(); ++i)
             {
                 const MapWarp* warp = map->warp(i);
-                varToWarp->addItem(warp->name());
-                varToWarp->setItemData(i, warp->id());
+                varToWarp->addItem(warp->name(), warp->id());
             }
         }
     }