libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-27 20:28:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Kind of hack that seems to synchronize loom's cutscenes + remove these damned ^M (time to configure my CVS properly I guess ...)

Browse Source 
svn-id: r3885
This commit is contained in:
Nicolas Bacca 2002-04-07 01:40:38 +00:00
parent 37116811cc
commit facec50a49
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
script_v1.cpp
View File

@ -2488,7 +2488,6 @@ void Scumm::decodeParseString() {
else else
offset = 0; offset = 0;
delay = (int)((getVarOrDirectWord(0x40) & 0xffff) * 7.5); delay = (int)((getVarOrDirectWord(0x40) & 0xffff) * 7.5);
if (_gameId == GID_LOOM256) if (_gameId == GID_LOOM256)
cd_play(this, 1, 0, offset, delay); cd_play(this, 1, 0, offset, delay);
else else

15
scummvm.cpp
View File

@ -187,8 +187,7 @@ void Scumm::checkRange(int max, int min, int no, const char *str) {
} }
int Scumm::scummLoop(int delta) { int Scumm::scummLoop(int delta) {
static int counter=0;
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
@ -228,8 +227,16 @@ int Scumm::scummLoop(int delta) {
_vars[VAR_MOUSE_Y] = mouse.y; _vars[VAR_MOUSE_Y] = mouse.y;
_vars[VAR_DEBUGMODE] = _debugMode; _vars[VAR_DEBUGMODE] = _debugMode;
if (_features & GF_AUDIOTRACKS) if (_features & GF_AUDIOTRACKS) {
_vars[VAR_MI1_TIMER]+=5; if (delta) {
if (++counter != 2)
_vars[VAR_MI1_TIMER]+=5;
else {
counter = 0;
_vars[VAR_MI1_TIMER]+=6;
}
}
}
else else
if(_features & GF_OLD256) if(_features & GF_OLD256)
_vars[VAR_MUSIC_FLAG]++; // ENDERFIX _vars[VAR_MUSIC_FLAG]++; // ENDERFIX

1
sdl.cpp
View File

@ -678,7 +678,6 @@ static int cd_track, cd_num_loops = 0, cd_start_frame, cd_end_frame;
static Uint32 cd_end_time, cd_stop_time, cd_next_second; static Uint32 cd_end_time, cd_stop_time, cd_next_second;
void cd_play(Scumm *s, int track, int num_loops, int start_frame, int end_frame) { void cd_play(Scumm *s, int track, int num_loops, int start_frame, int end_frame) {
scumm->_vars[14] = 0; scumm->_vars[14] = 0;
#ifdef COMPRESSED_SOUND_FILE #ifdef COMPRESSED_SOUND_FILE