ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make input mapping tables and enums less weird. not sure if i did this right.

This commit is contained in:
zeromus 2014-03-04 00:27:04 +00:00
parent 23972eeca8
commit ebafa4b01d
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
trunk/src/drivers/win/mapinput.cpp
View File

@ -424,9 +424,9 @@ void PopulateConflictTable(int* conflictTable)
{ {
// Check whether there are conflicts between the // Check whether there are conflicts between the
// selected hotkeys. // selected hotkeys.
for(unsigned i = 0; i < EMUCMD_MAX - 1; ++i) for(unsigned i = 0; i < EMUCMD_NUM - 1; ++i)
{ {
for(unsigned int j = i + 1; j < EMUCMD_MAX; ++j) for(unsigned int j = i + 1; j < EMUCMD_NUM; ++j)
{ {
if(!GetCommandKeyCombo((EMUCMD)i).isEmpty() && if(!GetCommandKeyCombo((EMUCMD)i).isEmpty() &&
GetCommandKeyCombo((EMUCMD)i).get() == GetCommandKeyCombo((EMUCMD)j).get() && GetCommandKeyCombo((EMUCMD)i).get() == GetCommandKeyCombo((EMUCMD)j).get() &&
@ -463,8 +463,8 @@ void PopulateMappingDisplay(HWND hwndDlg)
if (filter == EMUCMDTYPE_MAX + 3) if (filter == EMUCMDTYPE_MAX + 3)
{ {
// Set up the conflict table. // Set up the conflict table.
conflictTable = (int*)malloc(sizeof(int)*EMUCMD_MAX); conflictTable = (int*)malloc(sizeof(int)*EMUCMD_NUM);
memset(conflictTable, 0, sizeof(int)*EMUCMD_MAX); memset(conflictTable, 0, sizeof(int)*EMUCMD_NUM);
PopulateConflictTable(conflictTable); PopulateConflictTable(conflictTable);
} }
@ -475,7 +475,7 @@ void PopulateMappingDisplay(HWND hwndDlg)
int newItemCount = 0; int newItemCount = 0;
// Populate display. // Populate display.
for(int i = 0, idx = 0; i < EMUCMD_MAX; ++i) for(int i = 0, idx = 0; i < EMUCMD_NUM; ++i)
{ {
// Check if the current key should be displayed // Check if the current key should be displayed
// according to the current filter. // according to the current filter.
@ -638,7 +638,7 @@ void AskForHotkey(HWND hwndListView)
**/ **/
void ApplyDefaultCommandMapping() void ApplyDefaultCommandMapping()
{ {
for(unsigned int i = 0; i < EMUCMD_MAX; ++i) { for(unsigned int i = 0; i < EMUCMD_NUM; ++i) {
SetCommandKeyCombo((EMUCMD)i, KeyCombo(0)); SetCommandKeyCombo((EMUCMD)i, KeyCombo(0));
} }
@ -748,14 +748,14 @@ BOOL CALLBACK MapInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
void MapInput(void) void MapInput(void)
{ {
// Make a backup of the current mappings, in case the user changes their mind. // Make a backup of the current mappings, in case the user changes their mind.
int backupmapping[EMUCMD_MAX]; int backupmapping[EMUCMD_NUM];
for(unsigned int i = 0; i < EMUCMD_MAX; ++i) { for(unsigned int i = 0; i < EMUCMD_NUM; ++i) {
backupmapping[i] = GetCommandKeyCombo((EMUCMD)i).get(); backupmapping[i] = GetCommandKeyCombo((EMUCMD)i).get();
} }
if(!DialogBox(fceu_hInstance, "MAPINPUT", hAppWnd, MapInputDialogProc)) if(!DialogBox(fceu_hInstance, "MAPINPUT", hAppWnd, MapInputDialogProc))
{ {
for(unsigned int i = 0; i < EMUCMD_MAX; ++i) { for(unsigned int i = 0; i < EMUCMD_NUM; ++i) {
SetCommandKeyCombo((EMUCMD)i, KeyCombo(backupmapping[i])); SetCommandKeyCombo((EMUCMD)i, KeyCombo(backupmapping[i]));
} }
} }

2
trunk/src/input.cpp
View File

@ -88,7 +88,7 @@ extern bool frameAdvanceLagSkip;
extern bool movieSubtitles; extern bool movieSubtitles;
//------------- //-------------
static int CommandMapping[EMUCMD_MAX]; static int CommandMapping[EMUCMD_NUM];
static uint8 joy_readbit[2]; static uint8 joy_readbit[2];
uint8 joy[4]={0,0,0,0}; //HACK - should be static but movie needs it uint8 joy[4]={0,0,0,0}; //HACK - should be static but movie needs it

7
trunk/src/input.h
View File

@ -109,8 +109,8 @@ void FCEU_DoSimpleCommand(int cmd);
enum EMUCMD enum EMUCMD
{ {
EMUCMD_NONE=0, EMUCMD_NONE=-1,
EMUCMD_POWER, EMUCMD_POWER=0,
EMUCMD_RESET, EMUCMD_RESET,
EMUCMD_PAUSE, EMUCMD_PAUSE,
EMUCMD_FRAME_ADVANCE, EMUCMD_FRAME_ADVANCE,
@ -244,8 +244,7 @@ enum EMUCMD
//----------------------------- //-----------------------------
//keep adding these in order of newness or else the hotkey binding configs will get messed up... //keep adding these in order of newness or else the hotkey binding configs will get messed up...
EMUCMD_FPS_DISPLAY_TOGGLE, EMUCMD_FPS_DISPLAY_TOGGLE,
//first element is NONE, so elements in this enum more than emucommands by 1, the last one isn't a count of commands EMUCMD_NUM,
EMUCMD_MAX = EMUCMD_FPS_DISPLAY_TOGGLE
}; };
enum EMUCMDTYPE enum EMUCMDTYPE