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

Merge branch 'master' into feature/filesystem

This commit is contained in:
Stephen Anthony 2022-06-26 18:08:33 -02:30
parent f714933f6f 08db05d198
commit cca62ea4fd
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docs/index.html
View File

@ -699,6 +699,18 @@
<td>F4</td> <td>F4</td>
</tr> </tr>
<tr>
<td>Toggle Black/White TV</td>
<td>-</td>
<td>-</td>
</tr>
<tr>
<td>Toggle 7800 pause &#185;</td>
<td>Alt + F3</td>
<td>Cmd + F3</td>
</tr>
<tr> <tr>
<td>Left Player Difficulty A</td> <td>Left Player Difficulty A</td>
<td>F5</td> <td>F5</td>
@ -777,6 +789,11 @@
<td>Shift-Cmd + P</td> <td>Shift-Cmd + P</td>
</tr> </tr>
<tr>
<td colspan="3"><center><font size="-1">
&#185; only if "Console" is set to "Atari 7800" in <b><a href="#Debugger">Developer Settings</a></b>.
</td>
</tr>
</table> </table>
</br> </br>

4
src/emucore/EventHandler.cxx
View File

@ -1659,12 +1659,10 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
myOSystem.console().switches().update(); myOSystem.console().switches().update();
} }
return; return;
case Event::Console7800Pause: case Event::Console7800Pause:
if(pressed && !repeated) if(pressed && !repeated)
{ {
myEvent.set(Event::ConsoleBlackWhite, 0); myEvent.set(Event::Console7800Pause, myOSystem.console().switches().tvColor() ? 1 : 0);
myEvent.set(Event::ConsoleColor, 0);
if (myIs7800) if (myIs7800)
myOSystem.frameBuffer().showTextMessage("Pause pressed"); myOSystem.frameBuffer().showTextMessage("Pause pressed");
myOSystem.console().switches().update(); myOSystem.console().switches().update();