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

Remove DisableHDMA and DisableIRQ from windows port

This commit is contained in:
OV2 2010-11-29 02:53:51 +01:00
parent c865491043
commit 938a2e28ef
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
win32/wconfig.cpp
View File

@ -301,7 +301,6 @@ void WinSetDefaultValues ()
// CPU options // CPU options
Settings.HDMATimingHack = 100; Settings.HDMATimingHack = 100;
Settings.DisableIRQ = false;
Settings.Paused = false; Settings.Paused = false;
Timings.H_Max = SNES_CYCLES_PER_SCANLINE; Timings.H_Max = SNES_CYCLES_PER_SCANLINE;
Timings.HBlankStart = (256 * Timings.H_Max) / SNES_HCOUNTER_MAX; Timings.HBlankStart = (256 * Timings.H_Max) / SNES_HCOUNTER_MAX;
@ -315,7 +314,6 @@ void WinSetDefaultValues ()
// SNES graphics options // SNES graphics options
Settings.DisableGraphicWindows = false; Settings.DisableGraphicWindows = false;
Settings.DisableHDMA = false;
GUI.HeightExtend = false; GUI.HeightExtend = false;
Settings.DisplayFrameRate = false; Settings.DisplayFrameRate = false;
// Settings.SixteenBit = true; // Settings.SixteenBit = true;
@ -1104,7 +1102,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); 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(SaveScreenShot); ADD(SlotPlus); ADD(SlotMinus); ADD(SlotSave); ADD(SlotLoad);
ADD(BGL1); ADD(BGL2); ADD(BGL3); ADD(BGL4); ADD(BGL5); 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(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); 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 #undef ADD

11
win32/wsnes9x.cpp
View File

@ -528,7 +528,6 @@ struct SCustomKeys CustomKeys = {
{'8',0}, // Clipping Windows {'8',0}, // Clipping Windows
// {'8',0}, // BG Layering hack // {'8',0}, // BG Layering hack
{'9',0}, // Transparency {'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 // {'9',CUSTKEY_SHIFT_MASK}, // Interpolate Mode 7
{'6',0}, // Joypad Swap {'6',0}, // Joypad Swap
@ -1155,12 +1154,6 @@ int HandleKeyMessage(WPARAM wParam, LPARAM lParam)
S9xSetInfoString (InfoString); S9xSetInfoString (InfoString);
hitHotKey = true; hitHotKey = true;
} }
if(wParam == CustomKeys.HDMA.key
&& modifiers == CustomKeys.HDMA.modifiers)
{
Settings.DisableHDMA = !Settings.DisableHDMA;
S9xDisplayStateChange (WINPROC_HDMA_TEXT, !Settings.DisableHDMA);
}
if(wParam == CustomKeys.BGL1.key if(wParam == CustomKeys.BGL1.key
&& modifiers == CustomKeys.BGL1.modifiers) && modifiers == CustomKeys.BGL1.modifiers)
{ {
@ -7615,7 +7608,7 @@ static void set_hotkeyinfo(HWND hDlg)
SendDlgItemMessage(hDlg,IDC_HOTKEY5,WM_USER+44,CustomKeys.BGL5.key,CustomKeys.BGL5.modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY5,WM_USER+44,CustomKeys.BGL5.key,CustomKeys.BGL5.modifiers);
SendDlgItemMessage(hDlg,IDC_HOTKEY6,WM_USER+44,CustomKeys.ClippingWindows.key,CustomKeys.ClippingWindows.modifiers); 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_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_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,CustomKeys.GLCube.key,CustomKeys.GLCube.modifiers);
SendDlgItemMessage(hDlg,IDC_HOTKEY10,WM_USER+44,CustomKeys.SwitchControllers.key,CustomKeys.SwitchControllers.modifiers); 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_HOTKEY11,WM_USER+44,CustomKeys.JoypadSwap.key,CustomKeys.JoypadSwap.modifiers);
@ -7842,7 +7835,7 @@ switch(msg)
break; break;
case IDC_HOTKEY8: case IDC_HOTKEY8:
if(index == 0) CustomKeys.ScopeTurbo.key = wParam, CustomKeys.ScopeTurbo.modifiers = modifiers; if(index == 0) CustomKeys.ScopeTurbo.key = wParam, CustomKeys.ScopeTurbo.modifiers = modifiers;
if(index == 1) CustomKeys.HDMA.key = wParam, CustomKeys.HDMA.modifiers = modifiers; // if(index == 1) CustomKeys.HDMA.key = wParam, CustomKeys.HDMA.modifiers = modifiers;
if(index == 2) CustomKeys.TurboSelect.key = wParam, CustomKeys.TurboSelect.modifiers = modifiers; if(index == 2) CustomKeys.TurboSelect.key = wParam, CustomKeys.TurboSelect.modifiers = modifiers;
if(index == 3) CustomKeys.SelectSave[7].key = wParam, CustomKeys.SelectSave[7].modifiers = modifiers; if(index == 3) CustomKeys.SelectSave[7].key = wParam, CustomKeys.SelectSave[7].modifiers = modifiers;
break; break;

2
win32/wsnes9x.h
View File

@ -450,7 +450,7 @@ struct SCustomKeys {
SCustomKey ClippingWindows; SCustomKey ClippingWindows;
// SCustomKey BGLHack; // SCustomKey BGLHack;
SCustomKey Transparency; SCustomKey Transparency;
SCustomKey HDMA; // SCustomKey HDMA;
SCustomKey GLCube; SCustomKey GLCube;
// SCustomKey InterpMode7; // SCustomKey InterpMode7;
SCustomKey JoypadSwap; SCustomKey JoypadSwap;