aboutsummaryrefslogtreecommitdiff
path: root/engines/groovie
diff options
context:
space:
mode:
authorTravis Howell2009-07-07 07:09:56 +0000
committerTravis Howell2009-07-07 07:09:56 +0000
commitdd4b02c34aaa8f3c7a9bb0ae3ce6dd8fe8f7cb41 (patch)
tree630e9935c335ee15bd704e76b0c8887f4efca242 /engines/groovie
parentc233459359ba43aeb6421469b32086036901a394 (diff)
parent0a8cd4a27d1b9ad7974697d6524b3455290f8990 (diff)
downloadscummvm-rg350-dd4b02c34aaa8f3c7a9bb0ae3ce6dd8fe8f7cb41.tar.gz
scummvm-rg350-dd4b02c34aaa8f3c7a9bb0ae3ce6dd8fe8f7cb41.tar.bz2
scummvm-rg350-dd4b02c34aaa8f3c7a9bb0ae3ce6dd8fe8f7cb41.zip
Merged revisions 42163-42164,42167-42181,42196-42200 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk ........ r42163 | Kirben | 2009-07-06 16:21:59 +1000 (Mon, 06 Jul 2009) | 1 line Use graphics surfaces for screen buffers, and always use correct pitch when writing to the frameBuffer. ........ r42164 | Kirben | 2009-07-06 16:24:04 +1000 (Mon, 06 Jul 2009) | 1 line Ooops, remove debug code. ........ r42167 | thebluegr | 2009-07-06 20:39:22 +1000 (Mon, 06 Jul 2009) | 1 line Replaced sciprintf() calls with printf, DebugPrintf, warning and error calls ........ r42168 | thebluegr | 2009-07-06 21:10:35 +1000 (Mon, 06 Jul 2009) | 1 line Fixed compilation ........ r42169 | thebluegr | 2009-07-06 21:15:42 +1000 (Mon, 06 Jul 2009) | 1 line Added seChanged the warning displayed when a selector can't be mapped to a debugC - it's perfectly normal not to find certain selectors in certain SCI versions. Also, fixed the SCI version enums ........ r42170 | thebluegr | 2009-07-06 21:19:19 +1000 (Mon, 06 Jul 2009) | 1 line Assigned several unimplemented/unused kernel functions as stubs, so that we know when they're used and how they're called ........ r42171 | drmccoy | 2009-07-06 21:19:37 +1000 (Mon, 06 Jul 2009) | 1 line Splitting up the big evaluate() function ........ r42172 | thebluegr | 2009-07-06 21:33:28 +1000 (Mon, 06 Jul 2009) | 1 line When a song isn't found, send a "stop handle" event so that the engine won't wait forever (e.g. in SQ4CD, perhaps others) ........ r42173 | dreammaster | 2009-07-06 22:33:05 +1000 (Mon, 06 Jul 2009) | 1 line Removed all the current special cases coding for user (mouse press) waiting, and reimplemented it exactly the way the original did ........ r42174 | thebluegr | 2009-07-06 22:44:55 +1000 (Mon, 06 Jul 2009) | 1 line Proper handling of sound effects marked as music resources ........ r42175 | joostp | 2009-07-06 23:09:50 +1000 (Mon, 06 Jul 2009) | 2 lines add workaround for PSP compiler ICE ........ r42176 | drmccoy | 2009-07-06 23:52:47 +1000 (Mon, 06 Jul 2009) | 1 line Loop over the string instead of copying and then editing it (hopefully, the PSP GCC won't ICE again here :P) ........ r42177 | jvprat | 2009-07-07 01:23:50 +1000 (Tue, 07 Jul 2009) | 2 lines Groovie: Improve ROQ timing and audio sync (noticeable at least in the Clandestiny trailer) ........ r42178 | thebluegr | 2009-07-07 01:30:07 +1000 (Tue, 07 Jul 2009) | 1 line KQ6CD should be working correctly again ........ r42179 | thebluegr | 2009-07-07 01:50:44 +1000 (Tue, 07 Jul 2009) | 1 line Swapped the music and audio resource check for SCI1.1 games. Digital sound effects are now preferred over the synthesized ones ........ r42180 | lordhoto | 2009-07-07 02:17:03 +1000 (Tue, 07 Jul 2009) | 1 line Fix RTL from Kyra3 main menu. (It now doesn't quit ScummVM anymore) ........ r42181 | thebluegr | 2009-07-07 02:22:14 +1000 (Tue, 07 Jul 2009) | 1 line Renamed SCI_VERSION_01 -> SCI_VERSION_01_EGA ........ r42196 | dreammaster | 2009-07-07 11:14:55 +1000 (Tue, 07 Jul 2009) | 1 line Bugfix so the game speed will correctly change after showing the credits when the game is restarted ........ r42197 | dreammaster | 2009-07-07 12:49:33 +1000 (Tue, 07 Jul 2009) | 1 line Bugfix so that user delays work correctly ........ r42198 | dreammaster | 2009-07-07 12:51:42 +1000 (Tue, 07 Jul 2009) | 1 line Added workaround to briefly pause when displaying the first message of the shooting cut-scene, so it can be read properly ........ r42199 | dreammaster | 2009-07-07 16:23:09 +1000 (Tue, 07 Jul 2009) | 1 line Fix to the return values of the Op_GetMouseButton library function now allows the game's "Fisticuffs path" to work properly ........ r42200 | thebluegr | 2009-07-07 16:29:07 +1000 (Tue, 07 Jul 2009) | 1 line Removed unused define ........ svn-id: r42203
Diffstat (limited to 'engines/groovie')
-rw-r--r--engines/groovie/roq.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 7389bda112..856befe63f 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -277,6 +277,7 @@ bool ROQPlayer::processBlock() {
break;
case 0x1013: // Hang
assert(blockHeader.size == 0 && blockHeader.param == 0);
+ endframe = true;
break;
case 0x1020: // Mono sound samples
ok = processBlockSoundMono(blockHeader);