diff options
author | Max Horn | 2002-11-06 14:19:50 +0000 |
---|---|---|
committer | Max Horn | 2002-11-06 14:19:50 +0000 |
commit | 39b60537c8119fe0e3b2cbb1599dac7d689256e5 (patch) | |
tree | ca8ca12f48bfe2d13b49b2a5102110d42934d0b4 /scumm/scumm.h | |
parent | 503fd9ca64a40e11524eb519e99c346fd4790f72 (diff) | |
download | scummvm-rg350-39b60537c8119fe0e3b2cbb1599dac7d689256e5.tar.gz scummvm-rg350-39b60537c8119fe0e3b2cbb1599dac7d689256e5.tar.bz2 scummvm-rg350-39b60537c8119fe0e3b2cbb1599dac7d689256e5.zip |
removed more typecasts
svn-id: r5438
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r-- | scumm/scumm.h | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index 643633afed..08ee492878 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -778,17 +778,6 @@ public: void drawRoomObjects(int arg); void drawRoomObject(int i, int arg); void drawBox(int x, int y, int x2, int y2, int color); - void drawBomp(BompDrawData * bd, int param1, byte *data_ptr, int decode_mode, int mask); - int32 setupBompScale(byte * scalling, int32 size, byte scale); - void bompScaleFuncX(byte * line_buffer, byte * scalling_x_ptr, byte skip, int32 size); - int32 bompDecodeLineMode0(byte * src, byte * line_buffer, int32 size); - int32 bompDecodeLineMode1(byte * src, byte * line_buffer, int32 size); - int32 bompDecodeLineMode3(byte * src, byte * line_buffer, int32 size); - void bompApplyMask(byte * line_buffer, byte * mask_out, byte bits, int32 size); - void bompApplyShadow0(byte * line_buffer, byte * dst, int32 size); - void bompApplyShadow1(byte * line_buffer, byte * dst, int32 size); - void bompApplyShadow3(byte * line_buffer, byte * dst, int32 size); - void bompApplyActorPalette(byte * line_buffer, int32 size); void restoreBG(int left, int top, int right, int bottom); void redrawBGStrip(int start, int num); @@ -860,7 +849,28 @@ public: void blit(byte *dst, byte *src, int w, int h); + // bomp void decompressBomp(byte *dst, byte *src, int w, int h); + void drawBomp(BompDrawData * bd, int param1, byte *data_ptr, int decode_mode, int mask); + int32 setupBompScale(byte * scalling, int32 size, byte scale); + void bompScaleFuncX(byte * line_buffer, byte * scalling_x_ptr, byte skip, int32 size); + int32 bompDecodeLineMode0(byte * src, byte * line_buffer, int32 size); + int32 bompDecodeLineMode1(byte * src, byte * line_buffer, int32 size); + int32 bompDecodeLineMode3(byte * src, byte * line_buffer, int32 size); + void bompApplyMask(byte * line_buffer, byte * mask_out, byte bits, int32 size); + void bompApplyShadow0(byte * line_buffer, byte * dst, int32 size); + void bompApplyShadow1(byte * line_buffer, byte * dst, int32 size); + void bompApplyShadow3(byte * line_buffer, byte * dst, int32 size); + void bompApplyActorPalette(byte * line_buffer, int32 size); + + uint16 _bompShadowMode; + int32 _bompScaleRight, _bompScaleBottom; + byte * _bompScallingXPtr, * _bompScallingYPtr; + byte * _bompMaskPtr; + int32 _bompMaskPitch; + byte * _bompActorPalletePtr; + + uint _shakeFrame; int _screenStartStrip, _screenEndStrip; int _screenLeft, _screenTop; @@ -875,13 +885,6 @@ public: void removeBlastObjects(); void removeBlastObject(BlastObject *eo); - uint16 _bompShadowMode; - int32 _bompScaleRight, _bompScaleBottom; - byte * _bompScallingXPtr, * _bompScallingYPtr; - byte * _bompMaskPtr; - int32 _bompMaskPitch; - byte * _bompActorPalletePtr; - int _drawObjectQueNr; byte _drawObjectQue[200]; byte _palManipStart, _palManipEnd; @@ -970,8 +973,8 @@ public: bool _existLanguageFile; char *_languageBuffer; void loadLanguageBundle(); - void translateText(char * text, char * trans_buff); - char transText[200]; + void translateText(byte *text, byte *trans_buff); + byte _transText[256]; bool checkFixedDisk(); |