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

fix duplicate usage of button 2

This commit is contained in:
thrust26 2020-01-25 23:33:05 +01:00
parent 2751532a4b
commit 275f2ab444
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/index_r77.html
View File

@ -80,15 +80,10 @@
<th width=170px>Action</th> <th width=170px>Action</th>
</tr> </tr>
<tr> <tr>
<td>Button 3</td> <td>Button 4</td>
<td>4:3,16:9</td> <td>4:3,16:9</td>
<td>Open the command dialog</td> <td>Open the command dialog</td>
</tr> </tr>
<tr>
<td>Button 4</td>
<td>-</td>
<td>Open settings</td>
</tr>
<tr> <tr>
<td>Button 5</td> <td>Button 5</td>
<td>FRY</td> <td>FRY</td>
@ -97,6 +92,11 @@
<tr> <tr>
<td>Button 6</td> <td>Button 6</td>
<td>-</td> <td>-</td>
<td>Open settings</td>
</tr>
<tr>
<td>Button 7</td>
<td>-</td>
<td>Rewind game</td> <td>Rewind game</td>
</tr> </tr>
<tr> <tr>

6
src/common/PJoystickHandler.cxx
View File

@ -877,10 +877,10 @@ PhysicalJoystickHandler::EventMappingArray PhysicalJoystickHandler::DefaultRight
PhysicalJoystickHandler::EventMappingArray PhysicalJoystickHandler::DefaultCommonMapping = { PhysicalJoystickHandler::EventMappingArray PhysicalJoystickHandler::DefaultCommonMapping = {
// valid for all joysticks // valid for all joysticks
//#if defined(RETRON77) //#if defined(RETRON77)
{Event::CmdMenuMode, 2}, {Event::CmdMenuMode, 3}, // Note: buttons 0..2 are used by controllers!
{Event::OptionsMenuMode, 3},
{Event::ExitMode, 4}, {Event::ExitMode, 4},
{Event::RewindPause, 5}, {Event::OptionsMenuMode, 5},
{Event::RewindPause, 6},
{Event::ConsoleSelect, 7}, {Event::ConsoleSelect, 7},
{Event::ConsoleReset, 8}, {Event::ConsoleReset, 8},
//#endif //#endif

6
src/gui/R77HelpDialog.cxx
View File

@ -112,10 +112,10 @@ void R77HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title)
ADD_BIND(); ADD_BIND();
ADD_BIND("Joystick", "Console", "Command"); ADD_BIND("Joystick", "Console", "Command");
ADD_LINE(); ADD_LINE();
ADD_BIND("\\c2Button 3", "4:3,16:9", "Open command dialog"); ADD_BIND("\\c2Button 4", "4:3,16:9", "Open command dialog");
ADD_BIND("\\c2Button 4", "\\c2-", "Open settings");
ADD_BIND("\\c2Button 5", "FRY", "Return to launcher"); ADD_BIND("\\c2Button 5", "FRY", "Return to launcher");
ADD_BIND("\\c2Button 6", "-", "Rewind game"); ADD_BIND("\\c2Button 6", "\\c2-", "Open settings");
ADD_BIND("\\c2Button 7", "-", "Rewind game");
ADD_BIND("\\c2Button 8", "MODE", "Select"); ADD_BIND("\\c2Button 8", "MODE", "Select");
ADD_BIND("\\c2Button 9", "RESET", "Reset"); ADD_BIND("\\c2Button 9", "RESET", "Reset");
break; break;