diff options
| author | Paweł Kołodziejski | 2005-04-08 22:27:12 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2005-04-08 22:27:12 +0000 |
| commit | 5826b4eb911414fcf42b020471c62205b06507bb (patch) | |
| tree | 60b29642023ebf3df9847187e7765f2d915696d3 | |
| parent | 877d3fdad1eb6061a66fed93116c0662b1f6b5f4 (diff) | |
| download | scummvm-rg350-5826b4eb911414fcf42b020471c62205b06507bb.tar.gz scummvm-rg350-5826b4eb911414fcf42b020471c62205b06507bb.tar.bz2 scummvm-rg350-5826b4eb911414fcf42b020471c62205b06507bb.zip | |
fixed compilation and warnings
svn-id: r17457
| -rw-r--r-- | gob/driver_vga.cpp | 4 | ||||
| -rw-r--r-- | gob/global.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gob/driver_vga.cpp b/gob/driver_vga.cpp index ab569518a3..2d82096a7a 100644 --- a/gob/driver_vga.cpp +++ b/gob/driver_vga.cpp @@ -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 { diff --git a/gob/global.cpp b/gob/global.cpp index 43de8cfeea..87023aeb02 100644 --- a/gob/global.cpp +++ b/gob/global.cpp @@ -134,9 +134,9 @@ PalDesc *pPaletteDesc = 0; 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[] = { |