diff options
| author | Paul Gilbert | 2017-02-12 21:00:31 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-02-12 21:00:31 -0500 |
| commit | bb840c9ec205d4c6a94d73c107f520d557983791 (patch) | |
| tree | 121e17ab3572437c443a107503ff32959a18807f /engines/titanic/sound/music_room_instrument.cpp | |
| parent | 2c8d72afd70d9cb40daafec5d3b2947ba33fe2e2 (diff) | |
| download | scummvm-rg350-bb840c9ec205d4c6a94d73c107f520d557983791.tar.gz scummvm-rg350-bb840c9ec205d4c6a94d73c107f520d557983791.tar.bz2 scummvm-rg350-bb840c9ec205d4c6a94d73c107f520d557983791.zip | |
TITANIC: More renamings in music classes
Diffstat (limited to 'engines/titanic/sound/music_room_instrument.cpp')
| -rw-r--r-- | engines/titanic/sound/music_room_instrument.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/sound/music_room_instrument.cpp b/engines/titanic/sound/music_room_instrument.cpp index 144f9d190b..5e7bd9bb8c 100644 --- a/engines/titanic/sound/music_room_instrument.cpp +++ b/engines/titanic/sound/music_room_instrument.cpp @@ -52,7 +52,7 @@ void CMusicRoomInstrument::deinit() { CMusicRoomInstrument::CMusicRoomInstrument(CProjectItem *project, CSoundManager *soundManager, MusicWaveInstrument instrument) : _project(project), _soundManager(soundManager), _instrument(instrument) { Common::fill(&_gameObjects[0], &_gameObjects[4], (CGameObject *)nullptr); - _floatVal = 0.0; + _animTime = 0.0; _waveIndex = -1; _readPos = 0; _readIncrement = 0; @@ -66,7 +66,7 @@ CMusicRoomInstrument::CMusicRoomInstrument(CProjectItem *project, CSoundManager _gameObjects[1] = static_cast<CGameObject *>(_project->findByName("Piano Mouth")); _gameObjects[2] = static_cast<CGameObject *>(_project->findByName("Piano Left Arm")); _gameObjects[3] = static_cast<CGameObject *>(_project->findByName("Piano Right Arm")); - _floatVal = 0.45; + _animTime = 0.45; break; case MV_BASS: @@ -75,14 +75,14 @@ CMusicRoomInstrument::CMusicRoomInstrument(CProjectItem *project, CSoundManager case MV_BELLS: _gameObjects[0] = static_cast<CGameObject *>(_project->findByName("Tubular Bells")); - _floatVal = 0.4; + _animTime = 0.4; break; case MV_SNAKE: _gameObjects[0] = static_cast<CGameObject *>(_project->findByName("Snake_Hammer")); _gameObjects[1] = static_cast<CGameObject *>(_project->findByName("Snake_Glass")); _gameObjects[2] = static_cast<CGameObject *>(_project->findByName("Snake_Head")); - _floatVal = 0.17; + _animTime = 0.17; break; } } @@ -212,12 +212,12 @@ void CMusicRoomInstrument::update(int val) { case 60: _gameObjects[0]->movieSetAudioTiming(true); _gameObjects[0]->playMovie(0, 512, MOVIE_STOP_PREVIOUS); - _floatVal = 0.6; + _animTime = 0.6; break; case 62: _gameObjects[0]->playMovie(828, 1023, MOVIE_STOP_PREVIOUS); - _floatVal = 0.3; + _animTime = 0.3; break; case 63: |