This commit is contained in:
Paul 2001-07-12 16:19:20 +00:00
parent 12e2de0799
commit 041abf12b0
3 changed files with 6 additions and 20 deletions

View file

@ -104,7 +104,7 @@
int CFrontEndOptions::s_controlStyleValues[CPadConfig::NUM_PAD_CONFIGS+1]= int CFrontEndOptions::s_controlStyleValues[CPadConfig::NUM_PAD_CONFIGS+1]=
{ {
0,1,2,3, 0,1,2,
-1 -1
}; };
CGUITextReadout::TextReadoutData CFrontEndOptions::s_controlStyleReadoutText[CPadConfig::NUM_PAD_CONFIGS]= CGUITextReadout::TextReadoutData CFrontEndOptions::s_controlStyleReadoutText[CPadConfig::NUM_PAD_CONFIGS]=
@ -112,7 +112,6 @@ CGUITextReadout::TextReadoutData CFrontEndOptions::s_controlStyleReadoutText[CPa
{ 0,STR__FRONTEND__A }, { 0,STR__FRONTEND__A },
{ 1,STR__FRONTEND__B }, { 1,STR__FRONTEND__B },
{ 2,STR__FRONTEND__C }, { 2,STR__FRONTEND__C },
{ 3,STR__FRONTEND__D },
}; };

View file

@ -486,23 +486,10 @@ CPadConfig::sPadConfigTable CPadConfig::s_padConfigs[NUM_PAD_CONFIGS]=
PAD_UP, // PAD_CFG_UP PAD_UP, // PAD_CFG_UP
PAD_DOWN, // PAD_CFG_DOWN PAD_DOWN, // PAD_CFG_DOWN
PAD_CIRCLE, // PAD_CFG_FIRE PAD_SQUARE, // PAD_CFG_FIRE
PAD_CROSS, // PAD_CFG_CATCH PAD_CIRCLE, // PAD_CFG_CATCH
PAD_TRIANGLE, // PAD_CFG_JUMP PAD_CROSS, // PAD_CFG_JUMP
PAD_SQUARE, // PAD_CFG_WEAPONCHANGE PAD_TRIANGLE, // PAD_CFG_WEAPONCHANGE
}},
// Config D
{{
0, // PAD_CFG_NONE
PAD_SQUARE, // PAD_CFG_LEFT
PAD_CIRCLE, // PAD_CFG_RIGHT
PAD_TRIANGLE, // PAD_CFG_UP
PAD_CROSS, // PAD_CFG_DOWN
PAD_LEFT, // PAD_CFG_FIRE
PAD_UP, // PAD_CFG_CATCH
PAD_DOWN, // PAD_CFG_JUMP
PAD_RIGHT, // PAD_CFG_WEAPONCHANGE
}}, }},
}; };

View file

@ -104,7 +104,7 @@ class CPadConfig
public: public:
enum enum
{ {
NUM_PAD_CONFIGS=4, NUM_PAD_CONFIGS=3,
}; };
enum PAD_CFG enum PAD_CFG