return back missing controllers

top rider seems do not works properly though
This commit is contained in:
CaH4e3 2011-03-09 09:16:11 +00:00
parent bcada013d2
commit 7b4e7489e5
2 changed files with 8 additions and 7 deletions

View File

@ -1057,11 +1057,11 @@ static void DoTBConfig(HWND hParent, const char *text, char *_template, ButtConf
const unsigned int NUMBER_OF_PORTS = 2;
const unsigned int NUMBER_OF_NES_DEVICES = SI_COUNT;
const static unsigned int NUMBER_OF_FAMICOM_DEVICES = SIFC_COUNT;
const unsigned int NUMBER_OF_NES_DEVICES = SI_COUNT + 1;
const static unsigned int NUMBER_OF_FAMICOM_DEVICES = SIFC_COUNT + 1;
//these are unfortunate lists. they match the ESI and ESIFC enums
static const int configurable_nes[6]= { 0, 1, 0, 1, 1, 0 };
static const int configurable_fam[14]= { 0,0,0,0, 1,1,0,1, 1,1,1,0, 0,0 };
static const int configurable_nes[NUMBER_OF_NES_DEVICES]= { 0, 1, 0, 1, 1, 0 };
static const int configurable_fam[NUMBER_OF_FAMICOM_DEVICES]= { 0,0,0,0, 1,1,0,1, 1,1,1,0, 0,0 };
const unsigned int FAMICOM_POSITION = 2;
static void UpdateComboPad(HWND hwndDlg, WORD id)

View File

@ -49,10 +49,11 @@ inline const char* ESI_Name(ESI esi)
"Zapper",
"Power Pad A",
"Power Pad B",
"Arkanoid Paddle"
"Arkanoid Paddle",
"Mouse"
};
if(esi >= SI_NONE && esi < SI_COUNT)
if(esi >= SI_NONE && esi <= SI_COUNT)
return names[esi];
else return "<invalid ESI>";
}
@ -101,7 +102,7 @@ inline const char* ESIFC_Name(ESIFC esifc)
"Top Rider"
};
if(esifc >= SIFC_NONE && esifc < SIFC_COUNT)
if(esifc >= SIFC_NONE && esifc <= SIFC_COUNT)
return names[esifc];
else return "<invalid ESIFC>";
}