thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup; reordering stuff in gfx.cpp, trying to group code into logical groups (cursor, bomp, camera, palette, fades)

Browse source 
svn-id: r5985
This commit is contained in:
Max Horn 2002-12-15 23:40:37 +00:00
parent cfc4bc586a
commit 20c501ea58
3 changed files with 964 additions and 967 deletions
Download patch file Download diff file Expand all files Collapse all files

1913
scumm/gfx.cpp
View file

File diff suppressed because it is too large Load diff

7
scumm/gfx.h
View file

@ -114,12 +114,10 @@ class Gdi {
public: public:
Scumm *_vm; Scumm *_vm;
public:
int _numZBuffer; int _numZBuffer;
int _imgBufOffs[5]; int _imgBufOffs[5];
byte _disable_zbuffer; byte _disable_zbuffer;
int32 _numStrips; int32 _numStrips;
public:
int16 _mask_top, _mask_bottom, _mask_right, _mask_left; int16 _mask_top, _mask_bottom, _mask_right, _mask_left;
protected: protected:
@ -174,6 +172,9 @@ protected:
void decompressMaskImgOr(byte *dst, byte *src, int height); void decompressMaskImgOr(byte *dst, byte *src, int height);
void decompressMaskImg(byte *dst, byte *src, int height); void decompressMaskImg(byte *dst, byte *src, int height);
void drawStripToScreen(VirtScreen *vs, int x, int w, int t, int b);
void updateDirtyScreen(VirtScreen *vs);
public: public:
void drawBitmap(byte *ptr, VirtScreen *vs, int x, int y, int h, int stripnr, int numstrip, byte flag); void drawBitmap(byte *ptr, VirtScreen *vs, int x, int y, int h, int stripnr, int numstrip, byte flag);
void clearUpperMask(); void clearUpperMask();
@ -182,8 +183,6 @@ public:
void enableZBuffer() { _disable_zbuffer--; } void enableZBuffer() { _disable_zbuffer--; }
void resetBackground(int top, int bottom, int strip); void resetBackground(int top, int bottom, int strip);
void drawStripToScreen(VirtScreen *vs, int x, int w, int t, int b);
void updateDirtyScreen(VirtScreen *vs);
enum DrawBitmapFlags { enum DrawBitmapFlags {
dbAllowMaskOr = 1, dbAllowMaskOr = 1,

11
scumm/scumm.h
View file

@ -794,10 +794,6 @@ public:
void fadeIn(int effect); void fadeIn(int effect);
void fadeOut(int effect); void fadeOut(int effect);
void unkScreenEffect1();
void unkScreenEffect2();
void unkScreenEffect3();
void unkScreenEffect4();
void unkScreenEffect5(int a); void unkScreenEffect5(int a);
void unkScreenEffect6(); void unkScreenEffect6();
void transitionEffect(int a); void transitionEffect(int a);
@ -846,7 +842,14 @@ public:
uint16 _palManipCounter; uint16 _palManipCounter;
byte *_palManipPalette; byte *_palManipPalette;
byte *_palManipIntermediatePal; byte *_palManipIntermediatePal;
/* For each screen strip, gfxUsageBits contains a bitmask.
* The lower 30 bits each correspond to one actor and signify if any part
* of that actor is currently contained in that strip.
* If the left most bit is set, the strip (background) is dirty needs to be redrawn.
*/
uint32 gfxUsageBits[410]; uint32 gfxUsageBits[410];
byte *_shadowPalette; byte *_shadowPalette;
int _shadowPaletteSize; int _shadowPaletteSize;
byte _currentPalette[3 * 256]; byte _currentPalette[3 * 256];