[Scummvm-cvs-logs] CVS: scummvm/gob driver_vga.cpp,1.3,1.4 global.cpp,1.2,1.3

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10860

Modified Files:
	driver_vga.cpp global.cpp 
Log Message:
fixed compilation and warnings

Index: driver_vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/driver_vga.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- driver_vga.cpp	6 Apr 2005 14:33:31 -0000	1.3
+++ driver_vga.cpp	8 Apr 2005 22:27:12 -0000	1.4
@@ -21,7 +21,11 @@
  */
 #include "gob/driver_vga.h"
 
+#ifdef _MSC_VER
+#define STUB_FUNC	printf("STUB:")
+#else
 #define STUB_FUNC	printf("STUB: %s\n", __PRETTY_FUNCTION__)
+#endif
 
 namespace Gob {
 

Index: global.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/global.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- global.cpp	5 Apr 2005 15:53:16 -0000	1.2
+++ global.cpp	8 Apr 2005 22:27:12 -0000	1.3
@@ -134,9 +134,9 @@
 FileHandler pFileHandler = 0;
 
 int16 unusedPalette1[18] = {
-	0, 0x0b, 0, 0x5555, 0xAAAA, 0xFFFF, 0, 0x5555, 0xAAAA, 0xFFFF, 0,
-	    0x5555,
-	0xAAAA, 0xFFFF, 0, 0x5555, 0xAAAA, 0xFFFF
+	0, 0x0b, 0, (int16)0x5555, (int16)0xAAAA, (int16)0xFFFF, 0, (int16)0x5555,
+	(int16)0xAAAA, (int16)0xFFFF, 0, (int16)0x5555,
+	(int16)0xAAAA, (int16)0xFFFF, 0, (int16)0x5555, (int16)0xAAAA, (int16)0xFFFF
 };
 
 int16 unusedPalette2[] = {