[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.51,1.52 sdl-common.h,1.22,1.23

[Max Horn]

Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv10432

Modified Files:
	sdl-common.cpp sdl-common.h 
Log Message:
pedantic fixes

Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- sdl-common.cpp	20 May 2003 10:49:05 -0000	1.51
+++ sdl-common.cpp	21 May 2003 16:59:51 -0000	1.52
@@ -295,7 +295,7 @@
 }
 
 #define ROL(a,n) a = (a << (n)) | (a >> (32 - (n)))
-#define DOLINE(x) a ^= ((uint32*)buf)[0 + (x) * (_screenWidth / 4)]; b ^= ((uint32 *)buf)[1 + (x) * (_screenWidth / 4)]
+#define DOLINE(x) a ^= ((const uint32*)buf)[0 + (x) * (_screenWidth / 4)]; b ^= ((const uint32 *)buf)[1 + (x) * (_screenWidth / 4)]
 
 void OSystem_SDL_Common::mk_checksums(const byte *buf) {
 	uint32 *sums = _dirty_checksums;
@@ -471,15 +471,15 @@
 }
 	
 void OSystem_SDL_Common::set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {
-	assert(0 <= w && w <= MAX_MOUSE_W);
-	assert(0 <= h && h <= MAX_MOUSE_H);
+	assert(w <= MAX_MOUSE_W);
+	assert(h <= MAX_MOUSE_H);
 	_mouseCurState.w = w;
 	_mouseCurState.h = h;
 
 	_mouseHotspotX = hotspot_x;
 	_mouseHotspotY = hotspot_y;
 
-	_mouseData = (byte *)buf;
+	_mouseData = buf;
 
 	undraw_mouse();
 }
@@ -827,7 +827,7 @@
 	return false;
 }
 
-bool OSystem_SDL_Common::set_sound_proc(void *param, SoundProc *proc, byte format) {
+bool OSystem_SDL_Common::set_sound_proc(void *param, SoundProc *proc, byte /* format */) {
 	SDL_AudioSpec desired;
 
 	memset(&desired, 0, sizeof(desired));
@@ -897,7 +897,7 @@
 	int w = _mouseCurState.w;
 	int h = _mouseCurState.h;
 	byte color;
-	byte *src = _mouseData;		// Image representing the mouse
+	const byte *src = _mouseData;		// Image representing the mouse
 
 	// clip the mouse rect, and addjust the src pointer accordingly
 	if (x < 0) {

Index: sdl-common.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sdl-common.h	14 May 2003 19:47:57 -0000	1.22
+++ sdl-common.h	21 May 2003 16:59:51 -0000	1.23
@@ -190,7 +190,7 @@
 
 	bool _mouseVisible;
 	bool _mouseDrawn;
-	byte *_mouseData;
+	const byte *_mouseData;
 	byte *_mouseBackup;
 	MousePos _mouseCurState;
 	MousePos _mouseOldState;