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 --- general/Ref.cpp | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'general/Ref.cpp') diff --git a/general/Ref.cpp b/general/Ref.cpp index cad1b624..9424cf93 100644 --- a/general/Ref.cpp +++ b/general/Ref.cpp @@ -22,26 +22,17 @@ #include "Ref.h" -unsigned findIn(const unsigned end, const QString& str, const char* array[]) -{ - unsigned i = 0; - for (; i < end; ++i) - { - if (str == array[i]) - break; - } - return i; -} +const QStringList StatRBYStr = QStringList() << "HP", "Attack", "Defense", "Speed", "Special", "Special", "Accuracy", "Evasion"; +const QStringList StatGSCStr = QStringList() << "HP", "Attack", "Defense", "Speed", "Special Attack", "Special Defense", "Accuracy", "Evasion"; -const char* StatRBYStr[ST_End_Battle] = {"HP", "Attack", "Defense", "Speed", "Special", "Special", "Accuracy", "Evasion"}; -const char* StatGSCStr[ST_End_Battle] = {"HP", "Attack", "Defense", "Speed", "Special Attack", "Special Defense", "Accuracy", "Evasion"}; +const QStringList BattleMemberStr = QStringList() << "Player", "Enemy"; -const char* BattleMemberStr[BM_End] = {"Player", "Enemy"}; +const QStringList WeatherStr = QStringList() << "Ice", "Rain", "Sun", "Sand", "All"; -const char* WeatherStr[W_End_All] = {"Ice", "Rain", "Sun", "Sand", "All"}; +const QStringList DirectionStr = QStringList() << "Up", "Down", "Left", "Right", "None"; -const char* DirectionStr[D_End_None] = {"Up", "Down", "Left", "Right", "None"}; +const QStringList RelativeStr = QStringList() << "Less", "Less or Equal", "Equal", "Greater or Equal", "Greater", "Not Equal"; -const char* RelativeStr[REL_End] = {"Less", "Less or Equal", "Equal", "Greater or Equal", "Greater", "Not Equal"}; +const QStringList StatusStr = QStringList() << "Freeze", "Paralyze", "Sleep", "Poison", "Toxic Poison", "Burn", "Any"; -const char* StatusStr[STS_End] = {"Freeze", "Paralyze", "Sleep", "Poison", "Toxic Poison", "Burn", "Any"}; +const QStringList HMStr = QStringList() << "Cut" << "Fly" << "Surf" << "Strength" << "Flash" << "Whirlpool" << "Waterfall" << "Dive" << "Headbutt" << "Rock Smash" << "Defog" << "Rock Climb"; -- cgit