diff options
| author | Eugene Sandulenko | 2015-12-14 08:59:16 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:34:04 +0100 |
| commit | aa718e4c842722e76d035d7ed63e5e08ff6b67cf (patch) | |
| tree | 07b714eb13c47585d365b379d69fa7decf5d0ad8 /engines/lab/dispman.cpp | |
| parent | 5d240e3493a16c96cbded4669ba40fe0e86a593d (diff) | |
| download | scummvm-rg350-aa718e4c842722e76d035d7ed63e5e08ff6b67cf.tar.gz scummvm-rg350-aa718e4c842722e76d035d7ed63e5e08ff6b67cf.tar.bz2 scummvm-rg350-aa718e4c842722e76d035d7ed63e5e08ff6b67cf.zip | |
LAB: Variable rename
Diffstat (limited to 'engines/lab/dispman.cpp')
| -rw-r--r-- | engines/lab/dispman.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp index d4492607df..c76a6ece50 100644 --- a/engines/lab/dispman.cpp +++ b/engines/lab/dispman.cpp @@ -52,7 +52,7 @@ DisplayMan::DisplayMan(LabEngine *vm) : _vm(vm) { _curBitmap = nullptr; _displayBuffer = nullptr; _currentDisplayBuffer = nullptr; - FadePalette = nullptr; + _fadePalette = nullptr; _screenWidth = 0; _screenHeight = 0; @@ -79,7 +79,7 @@ void DisplayMan::loadPict(const char *filename) { } void DisplayMan::loadBackPict(const char *fileName, uint16 *highPal) { - FadePalette = highPal; + _fadePalette = highPal; _vm->_anim->_noPalChange = true; readPict(fileName, true); @@ -1194,13 +1194,13 @@ void DisplayMan::fade(bool fadeIn, uint16 res) { for (uint16 i = 0; i < 16; i++) { for (uint16 palIdx = 0; palIdx < 16; palIdx++) { if (fadeIn) - newPal[palIdx] = (0x00F & fadeNumIn(0x00F & FadePalette[palIdx], 0x00F & res, i)) + - (0x0F0 & fadeNumIn(0x0F0 & FadePalette[palIdx], 0x0F0 & res, i)) + - (0xF00 & fadeNumIn(0xF00 & FadePalette[palIdx], 0xF00 & res, i)); + newPal[palIdx] = (0x00F & fadeNumIn(0x00F & _fadePalette[palIdx], 0x00F & res, i)) + + (0x0F0 & fadeNumIn(0x0F0 & _fadePalette[palIdx], 0x0F0 & res, i)) + + (0xF00 & fadeNumIn(0xF00 & _fadePalette[palIdx], 0xF00 & res, i)); else - newPal[palIdx] = (0x00F & fadeNumOut(0x00F & FadePalette[palIdx], 0x00F & res, i)) + - (0x0F0 & fadeNumOut(0x0F0 & FadePalette[palIdx], 0x0F0 & res, i)) + - (0xF00 & fadeNumOut(0xF00 & FadePalette[palIdx], 0xF00 & res, i)); + newPal[palIdx] = (0x00F & fadeNumOut(0x00F & _fadePalette[palIdx], 0x00F & res, i)) + + (0x0F0 & fadeNumOut(0x0F0 & _fadePalette[palIdx], 0x0F0 & res, i)) + + (0xF00 & fadeNumOut(0xF00 & _fadePalette[palIdx], 0xF00 & res, i)); } setAmigaPal(newPal, 16); |