diff options
| author | Christopher Page | 2008-06-30 23:06:38 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-06-30 23:06:38 +0000 |
| commit | 563e28b668a44e830c26702b21f1d75cccb6cf03 (patch) | |
| tree | 3cafdfba80910873f70140187ab5dba06d2c24a3 /engines | |
| parent | c1ae3f7dd0fc52df450c136ecad14cedda26a20c (diff) | |
| download | scummvm-rg350-563e28b668a44e830c26702b21f1d75cccb6cf03.tar.gz scummvm-rg350-563e28b668a44e830c26702b21f1d75cccb6cf03.tar.bz2 scummvm-rg350-563e28b668a44e830c26702b21f1d75cccb6cf03.zip | |
Fixed some warnings
svn-id: r32857
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/lure/fights.cpp | 1 | ||||
| -rw-r--r-- | engines/lure/intro.cpp | 1 | ||||
| -rw-r--r-- | engines/lure/sound.cpp | 6 | ||||
| -rw-r--r-- | engines/lure/sound.h | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/engines/lure/fights.cpp b/engines/lure/fights.cpp index 5323122fa6..f3eaa6f248 100644 --- a/engines/lure/fights.cpp +++ b/engines/lure/fights.cpp @@ -113,7 +113,6 @@ void FightsManager::fightLoop() { Resources &res = Resources::getReference(); Game &game = Game::getReference(); Room &room = Room::getReference(); - Events &events = Events::getReference(); FighterRecord &playerFight = getDetails(PLAYER_ID); uint32 timerVal = g_system->getMillis(); diff --git a/engines/lure/intro.cpp b/engines/lure/intro.cpp index a21ac27266..894094d677 100644 --- a/engines/lure/intro.cpp +++ b/engines/lure/intro.cpp @@ -55,7 +55,6 @@ static const AnimRecord anim_screens[] = { bool Introduction::showScreen(uint16 screenId, uint16 paletteId, uint16 delaySize) { Screen &screen = Screen::getReference(); - Events &events = Events::getReference(); bool isEGA = LureEngine::getReference().isEGA(); screen.screen().loadScreen(screenId); screen.update(); diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp index 9253f03b28..94b7455a1f 100644 --- a/engines/lure/sound.cpp +++ b/engines/lure/sound.cpp @@ -579,12 +579,12 @@ void SoundManager::doTimer() { /*------------------------------------------------------------------------*/ MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], - uint8 channelNum, uint8 soundNum, bool isMusic, uint8 numChannels, void *soundData, uint32 size) { + uint8 channelNum, uint8 soundNum, bool isMus, uint8 numChannels, void *soundData, uint32 size) { _driver = driver; _channels = channels; _soundNumber = soundNum; _channelNumber = channelNum; - _isMusic = isMusic; + _isMusic = isMus; _numChannels = numChannels; _volume = 0; @@ -593,7 +593,7 @@ MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], _channels[_channelNumber + i].volume = 90; } - if (isMusic) + if (_isMusic) setVolume(ConfMan.getInt("music_volume")); else setVolume(ConfMan.getInt("sfx_volume")); diff --git a/engines/lure/sound.h b/engines/lure/sound.h index fd59729bc9..9959417e67 100644 --- a/engines/lure/sound.h +++ b/engines/lure/sound.h @@ -66,7 +66,7 @@ private: public: MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], - uint8 channelNum, uint8 soundNum, bool isMusic, uint8 numChannels, void *soundData, uint32 size); + uint8 channelNum, uint8 soundNum, bool isMus, uint8 numChannels, void *soundData, uint32 size); ~MidiMusic(); void setVolume(int volume); int getVolume() { return _volume; } |