[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.h,1.4,1.5 dialogs.cpp,1.34,1.35 imuse.cpp,2.8,2.9 imuse.h,1.22,1.23

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv21962

Modified Files:
	debugger.h dialogs.cpp imuse.cpp imuse.h 
Log Message:
more -pedantic warnings fixed

Index: debugger.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- debugger.h	20 Dec 2002 13:50:24 -0000	1.4
+++ debugger.h	25 Dec 2002 00:38:52 -0000	1.5
@@ -72,7 +72,7 @@
 	bool Cmd_Room(char _parameter[255][255]);
 	
 #ifdef USE_CONSOLE
-	static bool ScummDebugger::debuggerInputCallback(ConsoleDialog *console, const char *input, void *refCon);
+	static bool debuggerInputCallback(ConsoleDialog *console, const char *input, void *refCon);
 #endif
 };
 

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- dialogs.cpp	21 Dec 2002 00:55:45 -0000	1.34
+++ dialogs.cpp	25 Dec 2002 00:38:52 -0000	1.35
@@ -476,12 +476,12 @@
 	kMusicVolumeChanged		= 'muvc',
 	kSfxVolumeChanged		= 'sfvc',
 	kOKCmd					= 'ok  ',
-	kCancelCmd				= 'cncl',
+	kCancelCmd				= 'cncl'
 };
 
 enum {
 	kKeysCmd = 'KEYS',
-	kAboutCmd = 'ABOU',
+	kAboutCmd = 'ABOU'
 };
 
 OptionsDialog::OptionsDialog(NewGui *gui, Scumm *scumm)

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -d -r2.8 -r2.9
--- imuse.cpp	21 Dec 2002 23:19:42 -0000	2.8
+++ imuse.cpp	25 Dec 2002 00:38:52 -0000	2.9
@@ -287,7 +287,7 @@
 		pcChorus = 128,
 		pcPitchBendFactor = 256,
 		pcPriority = 512,
-		pcAll = 1023,
+		pcAll = 1023
 	};
 
 private:
@@ -2964,7 +2964,7 @@
 
 enum {
 	TYPE_PART = 1,
-	TYPE_PLAYER = 2,
+	TYPE_PLAYER = 2
 };
 
 int IMuseInternal::saveReference(void *me_ref, byte type, void *ref)

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- imuse.h	21 Dec 2002 21:09:35 -0000	1.22
+++ imuse.h	25 Dec 2002 00:38:53 -0000	1.23
@@ -44,7 +44,7 @@
 	~IMuse();
 
 	enum {
-		PROP_TEMPO_BASE = 1,
+		PROP_TEMPO_BASE = 1
 	};
 
 	void on_timer();