[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,1.77,1.78 imuse.h,1.20,1.21 scumm.h,1.75,1.76

[Jamieson Christian]

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

Modified Files:
	gfx.cpp imuse.h scumm.h 
Log Message:
Fixed myriad VC++ compile/link problems.
PLEASE DON'T MAKE CHANGES TO THE ACTUAL PROJECT FILES
UNLESS YOU MAKE THEM FOR *ALL* PRIMARY PORTS!

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- gfx.cpp	10 Dec 2002 23:44:59 -0000	1.77
+++ gfx.cpp	11 Dec 2002 01:25:15 -0000	1.78
@@ -2601,7 +2601,7 @@
 	}
 }
 
-static inline int colorWeight(int red, int green, int blue)
+static inline uint colorWeight(int red, int green, int blue)
 {
 	return 3 * red * red + 6 * green * green + 2 * blue * blue;
 }

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- imuse.h	5 Dec 2002 21:45:55 -0000	1.20
+++ imuse.h	11 Dec 2002 01:25:15 -0000	1.21
@@ -27,7 +27,7 @@
 class MidiDriver;
 class OSystem;
 class Scumm;
-struct Serializer;
+class Serializer;
 class SoundMixer;
 
 class IMuse {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- scumm.h	9 Dec 2002 02:14:17 -0000	1.75
+++ scumm.h	11 Dec 2002 01:25:15 -0000	1.76
@@ -39,7 +39,7 @@
 class Sound;
 class Bundle;
 struct ScummDebugger;
-struct Serializer;
+class Serializer;
 struct FindObjectInRoom;
 
 typedef void (Scumm::*OpcodeProc)();