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

Fix Autofire {L,R}. 

We were using directionals (left and right) instead.
This commit is contained in:
Edênis Freindorfer Azevedo 2019-08-20 15:15:24 -03:00 committed by Rafael Kitover
parent 4993cb88dc
commit cf47942f09
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wx/cmdevents.cpp
View File

@ -1412,18 +1412,18 @@ EVT_HANDLER(JoypadAutofireL, "Autofire L (toggle)")
{ {
bool menuPress; bool menuPress;
GetMenuOptionBool("JoypadAutofireL", menuPress); GetMenuOptionBool("JoypadAutofireL", menuPress);
toggleBitVar(&menuPress, &autofire, KEYM_LEFT); toggleBitVar(&menuPress, &autofire, KEYM_L);
SetMenuOption("JoypadAutofireL", menuPress ? 1 : 0); SetMenuOption("JoypadAutofireL", menuPress ? 1 : 0);
GetMenuOptionInt("JoypadAutofireL", autofire, KEYM_LEFT); GetMenuOptionInt("JoypadAutofireL", autofire, KEYM_L);
} }
EVT_HANDLER(JoypadAutofireR, "Autofire R (toggle)") EVT_HANDLER(JoypadAutofireR, "Autofire R (toggle)")
{ {
bool menuPress; bool menuPress;
GetMenuOptionBool("JoypadAutofireR", menuPress); GetMenuOptionBool("JoypadAutofireR", menuPress);
toggleBitVar(&menuPress, &autofire, KEYM_RIGHT); toggleBitVar(&menuPress, &autofire, KEYM_R);
SetMenuOption("JoypadAutofireR", menuPress ? 1 : 0); SetMenuOption("JoypadAutofireR", menuPress ? 1 : 0);
GetMenuOptionInt("JoypadAutofireR", autofire, KEYM_RIGHT); GetMenuOptionInt("JoypadAutofireR", autofire, KEYM_R);
} }
EVT_HANDLER_MASK(LoadGameRecent, "Load most recent save", CMDEN_SAVST) EVT_HANDLER_MASK(LoadGameRecent, "Load most recent save", CMDEN_SAVST)

4
src/wx/guiinit.cpp
View File

@ -2946,8 +2946,8 @@ bool MainFrame::BindControls()
MenuOptionBool("LoadGameAutoLoad", gopts.autoload_state); MenuOptionBool("LoadGameAutoLoad", gopts.autoload_state);
MenuOptionIntMask("JoypadAutofireA", autofire, KEYM_A); MenuOptionIntMask("JoypadAutofireA", autofire, KEYM_A);
MenuOptionIntMask("JoypadAutofireB", autofire, KEYM_B); MenuOptionIntMask("JoypadAutofireB", autofire, KEYM_B);
MenuOptionIntMask("JoypadAutofireL", autofire, KEYM_LEFT); MenuOptionIntMask("JoypadAutofireL", autofire, KEYM_L);
MenuOptionIntMask("JoypadAutofireR", autofire, KEYM_RIGHT); MenuOptionIntMask("JoypadAutofireR", autofire, KEYM_R);
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);