From 5fbf25a91c75c59d56cb6b58c899323772f9176a Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 16 May 2008 20:48:52 +0000 Subject: [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 --- pokemodr/MapTrainerUI.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'pokemodr/MapTrainerUI.cpp') diff --git a/pokemodr/MapTrainerUI.cpp b/pokemodr/MapTrainerUI.cpp index 30632013..69ac68fe 100644 --- a/pokemodr/MapTrainerUI.cpp +++ b/pokemodr/MapTrainerUI.cpp @@ -51,8 +51,7 @@ void MapTrainerUI::refreshGui() for (int i = 0; i < static_cast(original()->pokemod())->trainerCount(); ++i) { const Trainer* trainer = static_cast(original()->pokemod())->trainer(i); - varTrainerClass->addItem(trainer->name()); - varTrainerClass->setItemData(i, trainer->id()); + varTrainerClass->addItem(trainer->name(), trainer->id()); } varCoordinate->setMaximum(static_cast(original()->parent())->size()); varNumberFight->setMaximum(static_cast(original()->pokemod())->rules()->maxFight()); @@ -60,8 +59,7 @@ void MapTrainerUI::refreshGui() for (int i = 0; i < static_cast(original()->pokemod())->dialogCount(); ++i) { const Dialog* dialog = static_cast(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()); } varLeadTeamMember->clear(); for (int i = 0; i < static_cast(original())->teamMemberCount(); ++i) @@ -69,10 +67,9 @@ void MapTrainerUI::refreshGui() const MapTrainerTeamMember* teamMember = static_cast(original())->teamMember(i); const Species* species = static_cast(original()->pokemod())->species(teamMember->species()); if (species) - varLeadTeamMember->addItem(species->name()); + varLeadTeamMember->addItem(species->name(), teamMember->id()); else - varLeadTeamMember->addItem("Invalid Species"); - varLeadTeamMember->setItemData(i, teamMember->id()); + varLeadTeamMember->addItem("Invalid Species", teamMember->id()); } } -- cgit