diff options
| author | Max Horn | 2003-09-10 12:43:54 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-10 12:43:54 +0000 |
| commit | afe56a4aebd46d77b4c4cfbfda0bdb8533f0e318 (patch) | |
| tree | 3f8e44fe4c4e3c24256bd626612fdf779b850fb8 /scumm/smush | |
| parent | c0e2d2be66c783a7a3c149b8accc941da894d567 (diff) | |
| download | scummvm-rg350-afe56a4aebd46d77b4c4cfbfda0bdb8533f0e318.tar.gz scummvm-rg350-afe56a4aebd46d77b4c4cfbfda0bdb8533f0e318.tar.bz2 scummvm-rg350-afe56a4aebd46d77b4c4cfbfda0bdb8533f0e318.zip | |
added refCon parameter to timer class
svn-id: r10156
Diffstat (limited to 'scumm/smush')
| -rw-r--r-- | scumm/smush/smush_player.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index fb99c8a668..1646ea5872 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -195,8 +195,8 @@ static StringResource *getStrings(const char *file, const char *directory, bool SmushPlayer *player; -void SmushPlayer::timerCallback(void *ptr) { - Scumm *scumm = (Scumm *)ptr; +void SmushPlayer::timerCallback(void *refCon) { + Scumm *scumm = (Scumm *)refCon; if (!scumm->_smushPlay) return; @@ -255,7 +255,7 @@ void SmushPlayer::init() { _smixer->_silentMixer = _scumm->_silentDigitalImuse; _scumm->_smushPlay = true; _dst = _scumm->virtscr[0].screenPtr + _scumm->virtscr[0].xstart; - _scumm->_timer->installProcedure(&timerCallback, _speed); + _scumm->_timer->installProcedure(&timerCallback, _speed, _scumm); _alreadyInit = false; } |