diff options
| author | Bendegúz Nagy | 2016-08-18 14:20:18 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 44a5e36fc1dd2caaa45dd142f9d5355c5dc7a22f (patch) | |
| tree | 27413ce42127ce2dcbfe8b15d65d448a2a1956fe /engines | |
| parent | 921431c7ea6418d12cd8a6e69a13a949f7f79c72 (diff) | |
| download | scummvm-rg350-44a5e36fc1dd2caaa45dd142f9d5355c5dc7a22f.tar.gz scummvm-rg350-44a5e36fc1dd2caaa45dd142f9d5355c5dc7a22f.tar.bz2 scummvm-rg350-44a5e36fc1dd2caaa45dd142f9d5355c5dc7a22f.zip | |
DM: Pull K0016_aui_Palette_FadeTemporary into a class vaiable
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/dm/gfx.cpp | 9 | ||||
| -rw-r--r-- | engines/dm/gfx.h | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp index af4583e8b8..94820d9bb4 100644 --- a/engines/dm/gfx.cpp +++ b/engines/dm/gfx.cpp @@ -136,6 +136,8 @@ DisplayMan::DisplayMan(DMEngine *dmEngine) : _vm(dmEngine) { _g345_aui_BlankBuffer[i] = 0; _gK17_paletteFadeFrom = nullptr; + for (uint16 i = 0; i < 16; ++i) + _gK16_paletteFadeTemporary[i] = 0; initConstants(); } @@ -3751,14 +3753,13 @@ uint16 DisplayMan::f431_getDarkenedColor(uint16 RGBcolor) { } void DisplayMan::f436_STARTEND_FadeToPalette(uint16* P0849_pui_Palette) { - static uint16 K0016_aui_Palette_FadeTemporary[16]; - uint16 *paletteRegister = K0016_aui_Palette_FadeTemporary; + uint16 *paletteRegister = _gK16_paletteFadeTemporary; for (int16 i = 0; i < 16; i++) paletteRegister[i] = _gK17_paletteFadeFrom[i]; for (int16 i = 0; i < 8; i++) { - paletteRegister = K0016_aui_Palette_FadeTemporary; + paletteRegister = _gK16_paletteFadeTemporary; for (int16 colIdx = 0; colIdx < 16; colIdx++, paletteRegister++) { uint16 currentRGBColor = getFlag(*paletteRegister, D12_MASK_BLUE_COMPONENT); int16 targetRGBColor = getFlag(P0849_pui_Palette[colIdx], D12_MASK_BLUE_COMPONENT); @@ -3802,7 +3803,7 @@ void DisplayMan::f436_STARTEND_FadeToPalette(uint16* P0849_pui_Palette) { } _vm->f22_delay(1); _vm->_eventMan->f357_discardAllInput(); - f508_buildPaletteChangeCopperList(K0016_aui_Palette_FadeTemporary, K0016_aui_Palette_FadeTemporary); + f508_buildPaletteChangeCopperList(_gK16_paletteFadeTemporary, _gK16_paletteFadeTemporary); } } diff --git a/engines/dm/gfx.h b/engines/dm/gfx.h index 8d01365aee..d089d743fc 100644 --- a/engines/dm/gfx.h +++ b/engines/dm/gfx.h @@ -670,6 +670,7 @@ private: int16 _g695_doorNativeBitmapIndex_Front_D1LCR[2]; // @ G0695_ai_DoorNativeBitmapIndex_Front_D1LCR uint16 *_gK17_paletteFadeFrom; // @ K0017_pui_Palette_FadeFrom + uint16 _gK16_paletteFadeTemporary[16]; // @ K0016_aui_Palette_FadeTemporary public: uint16 _screenWidth; |