[Scummvm-cvs-logs] SF.net SVN: scummvm: [32857] scummvm/branches/gsoc2008-rtl/engines/lure

[cpage88 at users.sourceforge.net]

Revision: 32857
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32857&view=rev
Author:   cpage88
Date:     2008-06-30 16:06:38 -0700 (Mon, 30 Jun 2008)

Log Message:
-----------
Fixed some warnings

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/lure/fights.cpp
    scummvm/branches/gsoc2008-rtl/engines/lure/intro.cpp
    scummvm/branches/gsoc2008-rtl/engines/lure/sound.cpp
    scummvm/branches/gsoc2008-rtl/engines/lure/sound.h

Modified: scummvm/branches/gsoc2008-rtl/engines/lure/fights.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/lure/fights.cpp	2008-06-30 22:52:48 UTC (rev 32856)
+++ scummvm/branches/gsoc2008-rtl/engines/lure/fights.cpp	2008-06-30 23:06:38 UTC (rev 32857)
@@ -113,7 +113,6 @@
 	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();
 

Modified: scummvm/branches/gsoc2008-rtl/engines/lure/intro.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/lure/intro.cpp	2008-06-30 22:52:48 UTC (rev 32856)
+++ scummvm/branches/gsoc2008-rtl/engines/lure/intro.cpp	2008-06-30 23:06:38 UTC (rev 32857)
@@ -55,7 +55,6 @@
 
 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();

Modified: scummvm/branches/gsoc2008-rtl/engines/lure/sound.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/lure/sound.cpp	2008-06-30 22:52:48 UTC (rev 32856)
+++ scummvm/branches/gsoc2008-rtl/engines/lure/sound.cpp	2008-06-30 23:06:38 UTC (rev 32857)
@@ -579,12 +579,12 @@
 /*------------------------------------------------------------------------*/
 
 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 @@
 		_channels[_channelNumber + i].volume = 90;
 	}
 
-	if (isMusic)
+	if (_isMusic)
 		setVolume(ConfMan.getInt("music_volume"));
 	else
 		setVolume(ConfMan.getInt("sfx_volume"));		

Modified: scummvm/branches/gsoc2008-rtl/engines/lure/sound.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/lure/sound.h	2008-06-30 22:52:48 UTC (rev 32856)
+++ scummvm/branches/gsoc2008-rtl/engines/lure/sound.h	2008-06-30 23:06:38 UTC (rev 32857)
@@ -66,7 +66,7 @@
 
 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; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.