From 342fa6879e9fd8a757ebabe0a30370137b8d83a7 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 21 Jan 2008 06:38:00 +0000 Subject: [FIX] const char*[] -> QStringList for easier laoding into KComboBox [DEL] pokemod/pokemod_inc.h no longer needed git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@37 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokemod/ItemEffect.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'pokemod/ItemEffect.cpp') diff --git a/pokemod/ItemEffect.cpp b/pokemod/ItemEffect.cpp index 5e949c6a..8c8a04f5 100644 --- a/pokemod/ItemEffect.cpp +++ b/pokemod/ItemEffect.cpp @@ -20,20 +20,19 @@ // with this program. If not, see . ///////////////////////////////////////////////////////////////////////////// -#include #include "../general/Ref.h" #include "Pokemod.h" #include "MapWildList.h" #include "ItemEffect.h" -const char* PokeMod::ItemEffect::EffectStr[PokeMod::ItemEffect::E_End] = {"HP Cure", "Revive", "Cure Status", "Level Boost", "Stat Boost", "Flinch", "Go First", "Keep Alive", "Modify Stat (Battle Only)", "Shield (Battle Only)", "Run (Battle Only)", "PP Boost", "Type Boost", "PP Restore", "Experience Share", "Fishing Rod", "Repel", "Escape", "TM", "HM", "Map", "Ball", "Itemfinder", "Bike", "Scope", "Coin", "Coin Case", "Berry", "Acorn"}; -const char* PokeMod::ItemEffect::RelativeStr[PokeMod::ItemEffect::R_End] = {"Absolute", "Relative"}; -const char* PokeMod::ItemEffect::EscapeStr[PokeMod::ItemEffect::ES_End] = {"Anywhere", "Dungeon"}; -const char* PokeMod::ItemEffect::RepelStr[PokeMod::ItemEffect::RP_End] = {"First", "Max", "All"}; -const char* PokeMod::ItemEffect::AmountStr[PokeMod::ItemEffect::A_End] = {"All", "One"}; -const char* PokeMod::ItemEffect::SpecialPhysicalStr[PokeMod::ItemEffect::SP_End] = {"Special", "Physical"}; -const char* PokeMod::ItemEffect::BallTypeStr[PokeMod::ItemEffect::B_End] = {"Regular", "Master", "Level", "Love", "Area", "Time", "Battle", "Friend", "Stat", "Type", "Weight"}; -const char* PokeMod::ItemEffect::BerryTypeStr[PokeMod::ItemEffect::B2_End] = {"HP Cure", "Status Cure"}; +const QStringList PokeMod::ItemEffect::EffectStr = QStringList() << "HP Cure" << "Revive" << "Cure Status" << "Level Boost" << "Stat Boost" << "Flinch" << "Go First" << "Keep Alive" << "Modify Stat (Battle Only)" << "Shield (Battle Only)" << "Run (Battle Only)" << "PP Boost" << "Type Boost" << "PP Restore" << "Experience Share" << "Fishing Rod" << "Repel" << "Escape" << "TM" << "HM" << "Map" << "Ball" << "Itemfinder" << "Bike" << "Scope" << "Coin" << "Coin Case" << "Berry" << "Acorn"; +const QStringList PokeMod::ItemEffect::RelativeStr = QStringList() << "Absolute" << "Relative"; +const QStringList PokeMod::ItemEffect::EscapeStr = QStringList() << "Anywhere" << "Dungeon"; +const QStringList PokeMod::ItemEffect::RepelStr = QStringList() << "First" << "Max" << "All"; +const QStringList PokeMod::ItemEffect::AmountStr = QStringList() << "All" << "One"; +const QStringList PokeMod::ItemEffect::SpecialPhysicalStr = QStringList() << "Special" << "Physical"; +const QStringList PokeMod::ItemEffect::BallTypeStr = QStringList() << "Regular" << "Master" << "Level" << "Love" << "Area" << "Time" << "Battle" << "Friend" << "Stat" << "Type" << "Weight"; +const QStringList PokeMod::ItemEffect::BerryTypeStr = QStringList() << "HP Cure" << "Status Cure"; PokeMod::ItemEffect::ItemEffect(const Pokemod& par, const unsigned _id) : Object(par, _id), -- cgit