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-09-09 12:18:57 -02:30
parent 0f0bf63a41 ca2542d3a1
commit 1398719258
4 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -10,7 +10,7 @@ environment:
Configuration: Release Configuration: Release
SDL2_version: 2.0.22 SDL2_version: 2.24.0
install: install:

42
docs/index.html
View File

@ -1049,25 +1049,35 @@
</table> </table>
</br> </br>
<p><b>Kid Vid Voice Module (can be remapped via Keyboard Controller)</b></p> <p><b>Kid Vid Voice Module (can be remapped via Keyboard Controller and Console Controls)</b></p>
<table BORDER=2> <table BORDER=2>
<tr><th>Function</th> <th>Key</th></tr> <tr><th>Function</th> <th>Key</th> <th>Difficulty Switches &#185;</th></tr>
<tr><td>Start game #1</td><td>8 (same as Right Pad Button '1')</td></tr>
<tr><td>Start game #2</td><td>9 (same as Right Pad Button '2')</td></tr>
<tr><td>Start game #3</td><td>0 (same as Right Pad Button '3')</td></tr>
<tr><td>Skip current song</br>
(except initial songs of Berenstain Bears and Harmony Smurf)
</td><td>P (same as Right Pad Button '6')</td></tr>
<tr> <tr>
<td colspan="3"> <td>Start game #1</td>
The games can also be started with the 'Select Game' key. The <td>8 (Right Pad Button '1')</td>
settings of the difficulty switches</br>determine which game is started. <td>F6 (Left = A), F8 (Right = B)</td>
<ul> </tr>
<li>Left = B, Right = B: Start game #1</li> <tr>
<li>Left = A, Right = B: Start game #2</li> <td>Start game #2</td>
<li>Left = B, Right = A: Start game #3</li> <td>9 (Right Pad Button '2')</td>
</ul></td> <td>F5 (Left = B), F8 (Right = A)</td>
</tr>
<tr>
<td>Start game #3</td>
<td>0 (Right Pad Button '3')</td>
<td>F6 (Left = B), F7 (Right = B)</td>
</tr>
<tr>
<td>Skip current song (except initial songs of</br>
Berenstain Bears and Harmony Smurf) &#178;</td>
<td>P (Right Pad Button '6'),</br>
F1 ('Select Game')</td>
<td>-</td>
</tr>
<tr>
<td colspan="3">&#185; Press F1 ('Select Game') to start the selected game.
&#178; F4 ('Black/White TV') skip all allowed songs.</td>
</tr> </tr>
</table> </table>

3
src/debugger/DebuggerParser.cxx
View File

@ -2135,7 +2135,6 @@ void DebuggerParser::executeStepWhile()
} }
const Expression* expr = YaccParser::getResult(); const Expression* expr = YaccParser::getResult();
int ncycles = 0; int ncycles = 0;
uInt32 count = 0;
// Create a progress dialog box to show the progress searching through the // Create a progress dialog box to show the progress searching through the
// disassembly, since this may be a time-consuming operation // disassembly, since this may be a time-consuming operation
@ -2150,9 +2149,7 @@ void DebuggerParser::executeStepWhile()
do { do {
ncycles += debugger.step(false); ncycles += debugger.step(false);
progress.incProgress(); progress.incProgress();
++count;
} while (expr->evaluate() && !progress.isCancelled()); } while (expr->evaluate() && !progress.isCancelled());
progress.close(); progress.close();

3
src/emucore/KidVid.cxx
View File

@ -81,7 +81,8 @@ void KidVid::update()
myFilesFound = mySongPlaying = false; myFilesFound = mySongPlaying = false;
myOSystem.sound().stopWav(); myOSystem.sound().stopWav();
} }
else if(myEvent.get(Event::RightKeyboard6)) else if(myEvent.get(Event::RightKeyboard6) || myEvent.get(Event::ConsoleSelect) ||
(myOSystem.hasConsole() && !myOSystem.console().switches().tvColor()))
{ {
// Some first songs trigger a sequence of timed actions, they cannot be skipped // Some first songs trigger a sequence of timed actions, they cannot be skipped
if(mySongPointer && if(mySongPointer &&