added mute all songs option for Kid Vid

This commit is contained in:
Thomas Jentzsch 2022-09-09 14:09:46 +02:00
parent 098710a32e
commit 2027882c77
2 changed files with 28 additions and 17 deletions

View File

@ -1049,25 +1049,35 @@
</table>
</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>
<tr><th>Function</th> <th>Key</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><th>Function</th> <th>Key</th> <th>Difficulty Switches &#185;</th></tr>
<tr>
<td colspan="3">
The games can also be started with the 'Select Game' key. The
settings of the difficulty switches</br>determine which game is started.
<ul>
<li>Left = B, Right = B: Start game #1</li>
<li>Left = A, Right = B: Start game #2</li>
<li>Left = B, Right = A: Start game #3</li>
</ul></td>
<td>Start game #1</td>
<td>8 (Right Pad Button '1')</td>
<td>F6 (Left = A), F8 (Right = B)</td>
</tr>
<tr>
<td>Start game #2</td>
<td>9 (Right Pad Button '2')</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>
</table>

View File

@ -81,7 +81,8 @@ void KidVid::update()
myFilesFound = mySongPlaying = false;
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
if(mySongPointer &&