diff --git a/win32/InputCustom.cpp b/win32/InputCustom.cpp index 1ae94a37..031bbdce 100644 --- a/win32/InputCustom.cpp +++ b/win32/InputCustom.cpp @@ -669,7 +669,7 @@ int GetNumHotKeysAssignedTo (WORD Key, int modifiers) if(MATCHES_KEY(ClippingWindows)) count++; // if(MATCHES_KEY(BGLHack)) count++; if(MATCHES_KEY(Transparency)) count++; - if(MATCHES_KEY(GLCube)) count++; +// if(MATCHES_KEY(GLCube)) count++; // if(MATCHES_KEY(InterpMode7)) count++; if(MATCHES_KEY(JoypadSwap)) count++; if(MATCHES_KEY(SwitchControllers)) count++; diff --git a/win32/wconfig.cpp b/win32/wconfig.cpp index cf150c55..3f14a0c7 100644 --- a/win32/wconfig.cpp +++ b/win32/wconfig.cpp @@ -1044,7 +1044,7 @@ void WinRegisterConfigItems() ADDN(SelectSave[0],SelectSlot0); ADDN(SelectSave[1],SelectSlot1); ADDN(SelectSave[2],SelectSlot2); ADDN(SelectSave[3],SelectSlot3); ADDN(SelectSave[4],SelectSlot4); ADDN(SelectSave[5],SelectSlot5); ADDN(SelectSave[6],SelectSlot6); ADDN(SelectSave[7],SelectSlot7); ADDN(SelectSave[8],SelectSlot8); ADDN(SelectSave[9],SelectSlot9); ADD(SaveScreenShot); ADD(SlotPlus); ADD(SlotMinus); ADD(SlotSave); ADD(SlotLoad); ADD(BGL1); ADD(BGL2); ADD(BGL3); ADD(BGL4); ADD(BGL5); - ADD(ClippingWindows); /*ADD(BGLHack);*/ ADD(Transparency); ADD(HDMA); ADD(GLCube); + ADD(ClippingWindows); /*ADD(BGLHack);*/ ADD(Transparency); ADD(HDMA); /*ADD(GLCube);*/ /*ADD(InterpMode7);*/ ADD(JoypadSwap); ADD(SwitchControllers); ADD(ResetGame); ADD(ToggleCheats); ADD(TurboA); ADD(TurboB); ADD(TurboY); ADD(TurboX); ADD(TurboL); ADD(TurboR); ADD(TurboStart); ADD(TurboSelect); ADD(TurboUp); ADD(TurboDown); ADD(TurboLeft); ADD(TurboRight); #undef ADD diff --git a/win32/wlanguage.h b/win32/wlanguage.h index 6e8a0160..14a6b719 100644 --- a/win32/wlanguage.h +++ b/win32/wlanguage.h @@ -272,7 +272,6 @@ #define HOTKEYS_LABEL_2_6 TEXT("Clipping Windows") #define HOTKEYS_LABEL_2_7 TEXT("Transparency") #define HOTKEYS_LABEL_2_8 TEXT("HDMA Emulation") -#define HOTKEYS_LABEL_2_9 TEXT("GLCube Mode") #define HOTKEYS_LABEL_2_10 TEXT("Switch Controllers") #define HOTKEYS_LABEL_2_11 TEXT("Joypad Swap") #define HOTKEYS_LABEL_2_12 TEXT("Reset Game") diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp index f3535324..68eb3e8d 100644 --- a/win32/wsnes9x.cpp +++ b/win32/wsnes9x.cpp @@ -533,7 +533,7 @@ struct SCustomKeys CustomKeys = { // {'8',0}, // BG Layering hack {'9',0}, // Transparency {'0',0}, // HDMA Emulation - {'6',CUSTKEY_SHIFT_MASK}, // GLCube Mode +// {'6',CUSTKEY_SHIFT_MASK}, // GLCube Mode // {'9',CUSTKEY_SHIFT_MASK}, // Interpolate Mode 7 {'6',0}, // Joypad Swap {'7',0}, // Switch Controllers @@ -7742,13 +7742,11 @@ static void set_hotkeyinfo(HWND hDlg) SendDlgItemMessage(hDlg,IDC_HOTKEY6,WM_USER+44,CustomKeys.ClippingWindows.key,CustomKeys.ClippingWindows.modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY7,WM_USER+44,CustomKeys.Transparency.key,CustomKeys.Transparency.modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY8,WM_USER+44,CustomKeys.HDMA.key,CustomKeys.HDMA.modifiers); - SendDlgItemMessage(hDlg,IDC_HOTKEY9,WM_USER+44,CustomKeys.GLCube.key,CustomKeys.GLCube.modifiers); + SendDlgItemMessage(hDlg,IDC_HOTKEY9,WM_USER+44,0,0); SendDlgItemMessage(hDlg,IDC_HOTKEY10,WM_USER+44,CustomKeys.SwitchControllers.key,CustomKeys.SwitchControllers.modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY11,WM_USER+44,CustomKeys.JoypadSwap.key,CustomKeys.JoypadSwap.modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY12,WM_USER+44,CustomKeys.ResetGame.key,CustomKeys.ResetGame.modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY13,WM_USER+44,CustomKeys.ToggleCheats.key,CustomKeys.ToggleCheats.modifiers); -// SendDlgItemMessage(hDlg,IDC_HOTKEY12,WM_USER+44,CustomKeys.InterpMode7.key,CustomKeys.InterpMode7.modifiers); -// SendDlgItemMessage(hDlg,IDC_HOTKEY13,WM_USER+44,CustomKeys.BGLHack.key,CustomKeys.BGLHack.modifiers); break; case 2: SendDlgItemMessage(hDlg,IDC_HOTKEY1,WM_USER+44,CustomKeys.TurboA.key,CustomKeys.TurboA.modifiers); @@ -7763,7 +7761,7 @@ static void set_hotkeyinfo(HWND hDlg) SendDlgItemMessage(hDlg,IDC_HOTKEY10,WM_USER+44,CustomKeys.TurboUp.key,CustomKeys.TurboUp.modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY11,WM_USER+44,CustomKeys.TurboRight.key,CustomKeys.TurboRight.modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY12,WM_USER+44,CustomKeys.TurboDown.key,CustomKeys.TurboDown.modifiers); - SendDlgItemMessage(hDlg,IDC_HOTKEY12,WM_USER+44,0,0); + SendDlgItemMessage(hDlg,IDC_HOTKEY13,WM_USER+44,0,0); break; case 3: for(int i = 0 ; i < 10 ; i++) @@ -7809,7 +7807,7 @@ static void set_hotkeyinfo(HWND hDlg) SetDlgItemText(hDlg,IDC_LABEL_HK6,HOTKEYS_LABEL_2_6); SetDlgItemText(hDlg,IDC_LABEL_HK7,HOTKEYS_LABEL_2_7); SetDlgItemText(hDlg,IDC_LABEL_HK8,HOTKEYS_LABEL_2_8); - SetDlgItemText(hDlg,IDC_LABEL_HK9,HOTKEYS_LABEL_2_9); + SetDlgItemText(hDlg,IDC_LABEL_HK9,INPUTCONFIG_LABEL_UNUSED); SetDlgItemText(hDlg,IDC_LABEL_HK10,HOTKEYS_LABEL_2_10); SetDlgItemText(hDlg,IDC_LABEL_HK11,HOTKEYS_LABEL_2_11); SetDlgItemText(hDlg,IDC_LABEL_HK12,HOTKEYS_LABEL_2_12); @@ -7824,7 +7822,6 @@ static void set_hotkeyinfo(HWND hDlg) SetDlgItemText(hDlg,IDC_LABEL_HK6,HOTKEYS_LABEL_3_6); SetDlgItemText(hDlg,IDC_LABEL_HK7,HOTKEYS_LABEL_3_7); SetDlgItemText(hDlg,IDC_LABEL_HK8,HOTKEYS_LABEL_3_8); - SetDlgItemText(hDlg,IDC_LABEL_HK8,HOTKEYS_LABEL_3_8); SetDlgItemText(hDlg,IDC_LABEL_HK9,HOTKEYS_LABEL_3_9); SetDlgItemText(hDlg,IDC_LABEL_HK10,HOTKEYS_LABEL_3_10); SetDlgItemText(hDlg,IDC_LABEL_HK11,HOTKEYS_LABEL_3_11); @@ -7974,7 +7971,7 @@ switch(msg) break; case IDC_HOTKEY9: if(index == 0) CustomKeys.ScopePause.key = wParam, CustomKeys.ScopePause.modifiers = modifiers; - if(index == 1) CustomKeys.GLCube.key = wParam, CustomKeys.GLCube.modifiers = modifiers; + //if(index == 1) CustomKeys.GLCube.key = wParam, CustomKeys.GLCube.modifiers = modifiers; if(index == 2) CustomKeys.TurboLeft.key = wParam, CustomKeys.TurboLeft.modifiers = modifiers; if(index == 3) CustomKeys.SelectSave[8].key = wParam, CustomKeys.SelectSave[8].modifiers = modifiers; break; diff --git a/win32/wsnes9x.h b/win32/wsnes9x.h index 6e561ed0..753959dc 100644 --- a/win32/wsnes9x.h +++ b/win32/wsnes9x.h @@ -452,7 +452,7 @@ struct SCustomKeys { // SCustomKey BGLHack; SCustomKey Transparency; SCustomKey HDMA; - SCustomKey GLCube; + //SCustomKey GLCube; // SCustomKey InterpMode7; SCustomKey JoypadSwap; SCustomKey SwitchControllers;