diff options
author | Max Horn | 2002-08-31 13:29:10 +0000 |
---|---|---|
committer | Max Horn | 2002-08-31 13:29:10 +0000 |
commit | a39711e25670b366ed76534cc926ac70ea6c1edd (patch) | |
tree | 3fdba199dc0d93333d68dbb44a7e1bc571f78d93 /scumm/scumm.h | |
parent | 0c7771a7062fc982cbaca53fee022d9538a44f70 (diff) | |
download | scummvm-rg350-a39711e25670b366ed76534cc926ac70ea6c1edd.tar.gz scummvm-rg350-a39711e25670b366ed76534cc926ac70ea6c1edd.tar.bz2 scummvm-rg350-a39711e25670b366ed76534cc926ac70ea6c1edd.zip |
fixed compilation on Mac OS X; some cleanup; moved header file scumm/smusH/rect.h to common/rect.h
svn-id: r4877
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r-- | scumm/scumm.h | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index ecb3e1f468..b0412d1ac4 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -208,7 +208,7 @@ struct CharsetRenderer { byte *_charPtr; int _width, _height; int _offsX, _offsY; - byte _bitMask, _revBitMask; + byte _bitMask; int _bottom; int _virtScreenHeight; @@ -368,7 +368,7 @@ public: /* Init functions, etc */ byte _fastMode; - char *getGameName(); + const char *getGameName(); /* video buffer */ byte *_videoBuffer; @@ -835,8 +835,9 @@ public: void unkScreenEffect3(); void unkScreenEffect4(); void unkScreenEffect5(int a); - void transitionEffect(int a); // former unkScreenEffect7 - void dissolveEffect(int width, int height); // former unkScreenEffect5(0) and unkScreenEffect6 + void transitionEffect(int a); + void dissolveEffect(int width, int height); + void scrollEffect(int dir); void decompressBomp(byte *dst, byte *src, int w, int h); uint _shakeFrame; @@ -1397,20 +1398,8 @@ public: Scumm_v7(GameDetector *detector, OSystem *syst) : Scumm(detector, syst) {} }; -extern uint16 _debugLevel; - +// This is a constant lookup table of reverse bit masks extern const byte revBitMask[8]; -//void blitToScreen(Scumm *s, byte *src, int x, int y, int w, int h); - -#if defined(__GNUC__) -void CDECL error(const char *s, ...) NORETURN; -#else -void CDECL NORETURN error(const char *s, ...); -#endif - -void CDECL warning(const char *s, ...); -void CDECL debug(int level, const char *s, ...); -void checkHeap(); /* Direction conversion functions (between old dir and new dir format) */ int newDirToOldDir(int dir); |