diff options
| author | Max Horn | 2004-02-27 15:52:23 +0000 |
|---|---|---|
| committer | Max Horn | 2004-02-27 15:52:23 +0000 |
| commit | 751435d54f58f38d158432b9ea4700a5819148d1 (patch) | |
| tree | 12f049a41ca0347d00c3e2a22b3388ac592515b2 | |
| parent | b941740b72d86eb6290cacecf5386704be4fb9b6 (diff) | |
| download | scummvm-rg350-751435d54f58f38d158432b9ea4700a5819148d1.tar.gz scummvm-rg350-751435d54f58f38d158432b9ea4700a5819148d1.tar.bz2 scummvm-rg350-751435d54f58f38d158432b9ea4700a5819148d1.zip | |
cleanup
svn-id: r13069
| -rw-r--r-- | common/scaler.cpp | 3 | ||||
| -rw-r--r-- | common/scaler.h | 3 | ||||
| -rw-r--r-- | common/system.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/common/scaler.cpp b/common/scaler.cpp index 795c90d67a..ed96390962 100644 --- a/common/scaler.cpp +++ b/common/scaler.cpp @@ -51,7 +51,7 @@ void InitScalers(uint32 BitFormat) { } 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 @@ void DotMatrix(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPi q += nextlineDst << 1; } } - diff --git a/common/scaler.h b/common/scaler.h index af7beafe67..fb427c6fac 100644 --- a/common/scaler.h +++ b/common/scaler.h @@ -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, diff --git a/common/system.cpp b/common/system.cpp index 348273a4c8..bbede45b27 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -46,8 +46,6 @@ static OSystem *createSystem() { 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 |