mirror of https://github.com/stella-emu/stella.git
Merge branch 'master' into feature/filesystem
This commit is contained in:
commit
dfee4f9a56
|
@ -1056,7 +1056,9 @@
|
|||
<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</td><td>P (same as Right Pad Button '6')</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>
|
||||
</table>
|
||||
|
||||
</br>
|
||||
|
|
|
@ -258,7 +258,7 @@ void KidVid::setNextSong()
|
|||
myBeep = (ourSongPositions[mySongPointer] & 0x80) == 0;
|
||||
|
||||
const uInt8 temp = ourSongPositions[mySongPointer] & 0x7f;
|
||||
mySongLength = ourSongStart[temp + 1] - ourSongStart[temp] - 262 * ClickFrames;
|
||||
mySongLength = ourSongStart[temp + 1] - ourSongStart[temp];
|
||||
|
||||
// Play the WAV file
|
||||
const string& fileName = (temp < 10) ? "KVSHARED.WAV" : getFileName();
|
||||
|
|
Loading…
Reference in New Issue