diff options
| author | Max Horn | 2009-03-09 16:15:35 +0000 |
|---|---|---|
| committer | Max Horn | 2009-03-09 16:15:35 +0000 |
| commit | 4e6a7d83d116dc9ae81d51a7f0ac61134486304d (patch) | |
| tree | 4b34fe34ee0bf0af8c2cb82610b6ba5112bcc86b /engines/sci/engine | |
| parent | 77b40251ca9f22b71680888ee6dd69e027f765ba (diff) | |
| download | scummvm-rg350-4e6a7d83d116dc9ae81d51a7f0ac61134486304d.tar.gz scummvm-rg350-4e6a7d83d116dc9ae81d51a7f0ac61134486304d.tar.bz2 scummvm-rg350-4e6a7d83d116dc9ae81d51a7f0ac61134486304d.zip | |
SCI: Rewrote handling of song wakeup times & (iterator) delays, to avoid rounding issues between ticks (1/60s) and milliseconds; also fixed a bug (coming from Glutton ;) where delays measured in millisecs were treated as ticks instead. Thanks to Walter for the precursor of this patch
svn-id: r39263
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/savegame.cfsml | 2 | ||||
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/savegame.cfsml b/engines/sci/engine/savegame.cfsml index ce582ca730..0be2ab1dd4 100644 --- a/engines/sci/engine/savegame.cfsml +++ b/engines/sci/engine/savegame.cfsml @@ -505,7 +505,7 @@ int read_song_tp(Common::SeekableReadStream *fh, song_t **foo, const char *lastv *foo = (song_t*) malloc(sizeof(song_t)); token = _cfsml_get_identifier(fh, line, hiteof, &assignment); %CFSMLREAD song_t (*foo) FROM fh ERRVAR *hiteof FIRSTTOKEN token LINECOUNTER *line; - (*foo)->delay = 0; + (*foo)->_delay = 0; (*foo)->it = NULL; (*foo)->next_playing = (*foo)->next_stopping = (*foo)->next = NULL; return 0; diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index ca9ecff0a1..afee660a16 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -4129,7 +4129,7 @@ int read_song_tp(Common::SeekableReadStream *fh, song_t **foo, const char *lastv } // End of auto-generated CFSML data reader code #line 508 "engines/sci/engine/savegame.cfsml" - (*foo)->delay = 0; + (*foo)->_delay = 0; (*foo)->it = NULL; (*foo)->next_playing = (*foo)->next_stopping = (*foo)->next = NULL; return 0; |