diff options
| author | Joost Peters | 2003-04-29 20:13:00 +0000 |
|---|---|---|
| committer | Joost Peters | 2003-04-29 20:13:00 +0000 |
| commit | 849178c46296791cf58bbfe6e4751a1624bd5059 (patch) | |
| tree | d2eddba39d9a0b92b2f0227a007d91cdc4e94414 /sky/cd_intro.cpp | |
| parent | 89b808cb18143de3bd3280b93486b1fd6fe12cb8 (diff) | |
| download | scummvm-rg350-849178c46296791cf58bbfe6e4751a1624bd5059.tar.gz scummvm-rg350-849178c46296791cf58bbfe6e4751a1624bd5059.tar.bz2 scummvm-rg350-849178c46296791cf58bbfe6e4751a1624bd5059.zip | |
made vars consistent
svn-id: r7204
Diffstat (limited to 'sky/cd_intro.cpp')
| -rw-r--r-- | sky/cd_intro.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sky/cd_intro.cpp b/sky/cd_intro.cpp index a5901f469b..7f94afb936 100644 --- a/sky/cd_intro.cpp +++ b/sky/cd_intro.cpp @@ -190,11 +190,11 @@ #define cd_104 60097 #define cd_105 60098 -#define START_VOICE ( delay(200), _sound->playVoice(vocBuffer, loadedVocSize) ) -#define START_BG ( _sound->playBgSound(bgVocBuffer, bgVocSize) ) +#define START_VOICE ( delay(200), _skySound->playVoice(vocBuffer, loadedVocSize) ) +#define START_BG ( _skySound->playBgSound(bgVocBuffer, bgVocSize) ) #define LOAD_NEW_VOICE(num) ( free (vocBuffer), vocBuffer = _skyDisk->loadFile(num, NULL), loadedVocSize = _skyDisk->_lastLoadedFileSize ) #define LOAD_NEW_BG(num) ( free (bgVocBuffer), bgVocBuffer = _skyDisk->loadFile(num, NULL), bgVocSize = _skyDisk->_lastLoadedFileSize ) -#define WAIT_VOICE while (_sound->_voiceHandle != 0) { delay(50); } +#define WAIT_VOICE while (_skySound->_voiceHandle != 0) { delay(50); } #define WAIT_SEQUENCE while (_tseqFrames != 0) { delay(50); } #define WAIT_RELATIVE(x) ( delay(20 * (x)) ) #define COPY_SCREEN ( memcpy(_workScreen, workScreen2, GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT) ) @@ -822,7 +822,7 @@ void SkyState::doCDIntro() { cd2_seq_data_1 = _skyDisk->loadFile(cd_104, NULL); WAIT_SEQUENCE; //103 - _music->startMusic(2); + _skyMusic->startMusic(2); fnFadeDown(0); COPY_SCREEN; showScreen(); |