[Scummvm-cvs-logs] SF.net SVN: scummvm:[38257] scummvm/trunk/engines/sci/engine/ksound.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun Feb 15 16:24:43 CET 2009


Revision: 38257
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38257&view=rev
Author:   lordhoto
Date:     2009-02-15 15:24:43 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
Fixed unused variable warnings.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/ksound.cpp

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2009-02-15 15:21:54 UTC (rev 38256)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2009-02-15 15:24:43 UTC (rev 38257)
@@ -421,7 +421,7 @@
 	case _K_SCI01_SOUND_PLAY_HANDLE :
 	{
 		int looping = GET_SEL32V(obj, loop);
-		int vol = GET_SEL32V(obj, vol);
+		//int vol = GET_SEL32V(obj, vol);
 		int pri = GET_SEL32V(obj, pri);
 		RESTORE_BEHAVIOR rb = (RESTORE_BEHAVIOR) UKPV(2); 		/* Too lazy to look up a default value for this */
 
@@ -439,9 +439,9 @@
 	}
 	case _K_SCI01_SOUND_INIT_HANDLE :
 	{
-		int looping = GET_SEL32V(obj, loop);
-		int vol = GET_SEL32V(obj, vol);
-		int pri = GET_SEL32V(obj, pri);
+		//int looping = GET_SEL32V(obj, loop);
+		//int vol = GET_SEL32V(obj, vol);
+		//int pri = GET_SEL32V(obj, pri);
 
 		if (obj.segment && (scir_test_resource(s->resmgr, sci_sound, number)))
 		{
@@ -475,7 +475,7 @@
 
 		/* FIXME: Update the sound server state with 'vol' */
 		int looping = GET_SEL32V(obj, loop);
-		int vol = GET_SEL32V(obj, vol);
+		//int vol = GET_SEL32V(obj, vol);
 		int pri = GET_SEL32V(obj, pri);
 
 		sfx_song_set_loops(&s->sound,
@@ -604,14 +604,14 @@
 	case _K_SCI01_SOUND_MIDI_SEND :
 	{
 		int channel = SKPV(2);
-		int command = UKPV(3) == 0xff ? 
+		int midiCmd = UKPV(3) == 0xff ? 
 		  0xe0 : /* Pitch wheel */
 		  0xb0; /* UKPV(3) is actually a controller number */
 		int controller = UKPV(3);
 		int param = UKPV(4);
 
 		sfx_send_midi(&s->sound, handle, 
-			      channel, command, controller, param);
+			      channel, midiCmd, controller, param);
 		break;
 	}
 	case _K_SCI01_SOUND_REVERB :
@@ -620,7 +620,7 @@
 	}
 	case _K_SCI01_SOUND_HOLD :
 	{
-		int flag = SKPV(2);
+		//int flag = SKPV(2);
 		break;
 	}
 	}
@@ -723,7 +723,7 @@
 	case _K_SCI1_SOUND_PLAY_HANDLE :
 	{
 		int looping = GET_SEL32V(obj, loop);
-		int vol = GET_SEL32V(obj, vol);
+		//int vol = GET_SEL32V(obj, vol);
 		int pri = GET_SEL32V(obj, pri);
 		song_t *song = song_lib_find(s->sound.songlib, handle);
 
@@ -766,9 +766,9 @@
 	}
 	case _K_SCI1_SOUND_INIT_HANDLE :
 	{
-		int looping = GET_SEL32V(obj, loop);
-		int vol = GET_SEL32V(obj, vol);
-		int pri = GET_SEL32V(obj, pri);
+		//int looping = GET_SEL32V(obj, loop);
+		//int vol = GET_SEL32V(obj, vol);
+		//int pri = GET_SEL32V(obj, pri);
 
 		if (GET_SEL32V(obj, nodePtr))
 		{
@@ -869,9 +869,9 @@
 	case _K_SCI1_SOUND_UPDATE_CUES :
 	{
 		int signal = 0;
-		int min = 0;
-		int sec = 0;
-		int frame = 0;
+		//int min = 0;
+		//int sec = 0;
+		//int frame = 0;
 		int result = SI_LOOP; /* small hack */
 		int cue = 0;
 


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




More information about the Scummvm-git-logs mailing list