libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-09 04:16:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMI delays use minutes too, so remove hack.

Browse Source 
Confirmed with COMI disasm.

svn-id: r19226
This commit is contained in:
Travis Howell 2005-10-21 23:31:23 +00:00
parent b5e63f5bfb
commit 907c0835d0
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scumm/script_v6.cpp
View File

@ -2293,9 +2293,6 @@ void ScummEngine_v6::o6_systemOps() {
} }
void ScummEngine_v6::o6_delay() { void ScummEngine_v6::o6_delay() {
// FIXME - what exactly are we measuring here? In order for the other two
// delay functions to be right, it should be 1/60th of a second. But for
// CMI it would seem this should delay for 1/10th of a second...
uint32 delay = (uint16)pop(); uint32 delay = (uint16)pop();
vm.slot[_currentScript].delay = delay; vm.slot[_currentScript].delay = delay;
vm.slot[_currentScript].status = ssPaused; vm.slot[_currentScript].status = ssPaused;
@ -2304,21 +2301,13 @@ void ScummEngine_v6::o6_delay() {
void ScummEngine_v6::o6_delaySeconds() { void ScummEngine_v6::o6_delaySeconds() {
uint32 delay = (uint32)pop(); uint32 delay = (uint32)pop();
if (_gameId != GID_CMI) delay = delay * 60;
// FIXME - are we really measuring minutes here?
delay = delay * 60;
else
// FIXME - Is this the same in ComI? Seem to need a 1.5 minute
// multiplier for correct timing - see patch 664893
delay = delay * 90;
vm.slot[_currentScript].delay = delay; vm.slot[_currentScript].delay = delay;
vm.slot[_currentScript].status = ssPaused; vm.slot[_currentScript].status = ssPaused;
o6_breakHere(); o6_breakHere();
} }
void ScummEngine_v6::o6_delayMinutes() { void ScummEngine_v6::o6_delayMinutes() {
// FIXME - are we really measuring minutes here?
uint32 delay = (uint16)pop() * 3600; uint32 delay = (uint16)pop() * 3600;
vm.slot[_currentScript].delay = delay; vm.slot[_currentScript].delay = delay;
vm.slot[_currentScript].status = ssPaused; vm.slot[_currentScript].status = ssPaused;