[Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.54,1.55 scaler.h,1.24,1.25 system.cpp,1.5,1.6

[Max Horn]

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

Modified Files:
	scaler.cpp scaler.h system.cpp 
Log Message:
cleanup

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- scaler.cpp	6 Jan 2004 12:45:28 -0000	1.54
+++ scaler.cpp	27 Feb 2004 15:52:23 -0000	1.55
@@ -51,7 +51,7 @@
 	} else if (BitFormat == 555) {
 		dotmatrix = dotmatrix_555;
 	} else {
-		error("Unknown bit format %d\n", BitFormat);
+		error("Unknown bit format %d", BitFormat);
 	}
 
 	gBitFormat = BitFormat;
@@ -291,4 +291,3 @@
 		q += nextlineDst << 1;
 	}
 }
-

Index: scaler.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- scaler.h	6 Jan 2004 12:45:28 -0000	1.24
+++ scaler.h	27 Feb 2004 15:52:23 -0000	1.25
@@ -21,6 +21,9 @@
 #ifndef COMMON_SCALER_H
 #define COMMON_SCALER_H
 
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+
 extern void InitScalers(uint32 BitFormat);
 
 typedef void ScalerProc(const uint8 *srcPtr, uint32 srcPitch,

Index: system.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- system.cpp	24 Feb 2004 22:39:38 -0000	1.5
+++ system.cpp	27 Feb 2004 15:52:23 -0000	1.6
@@ -46,8 +46,6 @@
 	return OSystem_MorphOS_create(gfx_mode, ConfMan.getBool("fullscreen"));
 #elif defined(_WIN32_WCE)
 	return OSystem_WINCE3_create();
-#elif defined(MACOS_CARBON)
-	return OSystem_MAC_create(gfx_mode, ConfMan.getBool("fullscreen"));
 #elif defined(__GP32__)	// ph0x
 	return OSystem_GP32_create(GFX_NORMAL, true);
 #elif defined(__PALM_OS__) //chrilith