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

Merge pull request #866 from Squall-Leonhart/master 

in Wx, the Option is Enable MMX, make the variable also enableMMX and…
This commit is contained in:
Zach Bacon 2021-08-19 09:44:30 -04:00 committed by GitHub
parent 157277e028 41d8ab5d26
commit 1426358da4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/ConfigManager.cpp
View File

@ -166,7 +166,7 @@ int captureFormat = 0;
int cheatsEnabled = true; int cheatsEnabled = true;
int cpuDisableSfx = false; int cpuDisableSfx = false;
int cpuSaveType = 0; int cpuSaveType = 0;
int disableMMX; int enableMMX;
int disableStatusMessages = 0; int disableStatusMessages = 0;
int dsoundDisableHardwareAcceleration; int dsoundDisableHardwareAcceleration;
int filterHeight; int filterHeight;
@ -307,7 +307,7 @@ struct option argOptions[] = {
{ "cpu-disable-sfx", no_argument, &cpuDisableSfx, 1 }, { "cpu-disable-sfx", no_argument, &cpuDisableSfx, 1 },
{ "cpu-save-type", required_argument, 0, OPT_CPU_SAVE_TYPE }, { "cpu-save-type", required_argument, 0, OPT_CPU_SAVE_TYPE },
{ "debug", no_argument, 0, 'd' }, { "debug", no_argument, 0, 'd' },
{ "disable-mmx", no_argument, &disableMMX, 1 }, { "enable-mmx", no_argument, &enableMMX, 1 },
{ "disable-sfx", no_argument, &cpuDisableSfx, 1 }, { "disable-sfx", no_argument, &cpuDisableSfx, 1 },
{ "disable-status-messages", no_argument, &disableStatusMessages, 1 }, { "disable-status-messages", no_argument, &disableStatusMessages, 1 },
{ "dotcode-file-name-load", required_argument, 0, OPT_DOTCODE_FILE_NAME_LOAD }, { "dotcode-file-name-load", required_argument, 0, OPT_DOTCODE_FILE_NAME_LOAD },
@ -495,7 +495,7 @@ void LoadConfig()
cheatsEnabled = ReadPref("cheatsEnabled", 0); cheatsEnabled = ReadPref("cheatsEnabled", 0);
cpuDisableSfx = ReadPref("disableSfx", 0); cpuDisableSfx = ReadPref("disableSfx", 0);
cpuSaveType = ReadPrefHex("saveType"); cpuSaveType = ReadPrefHex("saveType");
disableMMX = ReadPref("disableMMX", 0); enableMMX = ReadPref("enableMMX", 1);
disableStatusMessages = ReadPrefHex("disableStatus"); disableStatusMessages = ReadPrefHex("disableStatus");
filterMT = ReadPref("filterEnableMultiThreading", 0); filterMT = ReadPref("filterEnableMultiThreading", 0);
filter = ReadPref("filter", 0); filter = ReadPref("filter", 0);

2
src/common/ConfigManager.h
View File

@ -56,7 +56,7 @@ extern int cheatsEnabled;
extern int cpuDisableSfx; extern int cpuDisableSfx;
extern int cpuSaveType; extern int cpuSaveType;
extern int dinputKeyFocus; extern int dinputKeyFocus;
extern int disableMMX; extern int enableMMX;
extern int disableStatusMessages; extern int disableStatusMessages;
extern int dsoundDisableHardwareAcceleration; extern int dsoundDisableHardwareAcceleration;
extern int filterHeight; extern int filterHeight;

2
src/wx/cmdevents.cpp
View File

@ -2995,7 +2995,7 @@ EVT_HANDLER(ApplyPatches, "Apply IPS/UPS/IPF patches if found")
EVT_HANDLER(MMX, "Enable MMX") EVT_HANDLER(MMX, "Enable MMX")
{ {
#ifdef MMX #ifdef MMX
GetMenuOptionInt("MMX", disableMMX, 1); GetMenuOptionInt("MMX", enableMMX, 1);
update_opts(); update_opts();
#endif #endif
} }

2
src/wx/guiinit.cpp
View File

@ -3067,7 +3067,7 @@ bool MainFrame::BindControls()
MenuOptionIntMask("JoypadAutoholdR", autohold, KEYM_R); MenuOptionIntMask("JoypadAutoholdR", autohold, KEYM_R);
MenuOptionIntMask("JoypadAutoholdSelect", autohold, KEYM_SELECT); MenuOptionIntMask("JoypadAutoholdSelect", autohold, KEYM_SELECT);
MenuOptionIntMask("JoypadAutoholdStart", autohold, KEYM_START); MenuOptionIntMask("JoypadAutoholdStart", autohold, KEYM_START);
MenuOptionIntMask("MMX", disableMMX, 1); MenuOptionIntMask("MMX", enableMMX, 1);
MenuOptionBool("EmulatorSpeedupToggle", turbo); MenuOptionBool("EmulatorSpeedupToggle", turbo);
MenuOptionIntRadioValue("LinkType0Nothing", gopts.gba_link_type, 0); MenuOptionIntRadioValue("LinkType0Nothing", gopts.gba_link_type, 0);
MenuOptionIntRadioValue("LinkType1Cable", gopts.gba_link_type, 1); MenuOptionIntRadioValue("LinkType1Cable", gopts.gba_link_type, 1);

2
src/wx/opts.cpp
View File

@ -264,7 +264,7 @@ opt_desc opts[] = {
INTOPT("preferences/captureFormat", "", wxTRANSLATE("Screen capture file format"), captureFormat, 0, 1), INTOPT("preferences/captureFormat", "", wxTRANSLATE("Screen capture file format"), captureFormat, 0, 1),
INTOPT("preferences/cheatsEnabled", "", wxTRANSLATE("Enable cheats"), cheatsEnabled, 0, 1), INTOPT("preferences/cheatsEnabled", "", wxTRANSLATE("Enable cheats"), cheatsEnabled, 0, 1),
#ifdef MMX #ifdef MMX
INTOPT("preferences/disableMMX", "MMX", wxTRANSLATE("Enable MMX"), disableMMX, 0, 1), INTOPT("preferences/enableMMX", "MMX", wxTRANSLATE("Enable MMX"), enableMMX, 0, 1),
#endif #endif
INTOPT("preferences/disableStatus", "NoStatusMsg", wxTRANSLATE("Disable on-screen status messages"), disableStatusMessages, 0, 1), INTOPT("preferences/disableStatus", "NoStatusMsg", wxTRANSLATE("Disable on-screen status messages"), disableStatusMessages, 0, 1),
INTOPT("preferences/emulatorType", "", wxTRANSLATE("Type of system to emulate"), gbEmulatorType, 0, 5), INTOPT("preferences/emulatorType", "", wxTRANSLATE("Type of system to emulate"), gbEmulatorType, 0, 5),