libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some warnings

Browse Source 
svn-id: r32857
This commit is contained in:
Christopher Page 2008-06-30 23:06:38 +00:00
parent c1ae3f7dd0
commit 563e28b668
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/lure/fights.cpp
View File

@ -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();

1
engines/lure/intro.cpp
View File

@ -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();

6
engines/lure/sound.cpp
View File

@ -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"));

2
engines/lure/sound.h
View File

@ -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; }