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

LAB: Variable rename

Browse source
This commit is contained in:
Eugene Sandulenko 2015-12-14 08:59:16 +01:00 • committed by Willem Jan Palenstijn
parent 5d240e3493
commit aa718e4c84
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/lab/dispman.cpp
View file

@ -52,7 +52,7 @@ DisplayMan::DisplayMan(LabEngine *vm) : _vm(vm) {
_curBitmap = nullptr; _curBitmap = nullptr;
_displayBuffer = nullptr; _displayBuffer = nullptr;
_currentDisplayBuffer = nullptr; _currentDisplayBuffer = nullptr;
FadePalette = nullptr; _fadePalette = nullptr;
_screenWidth = 0; _screenWidth = 0;
_screenHeight = 0; _screenHeight = 0;
@ -79,7 +79,7 @@ void DisplayMan::loadPict(const char *filename) {
} }
void DisplayMan::loadBackPict(const char *fileName, uint16 *highPal) { void DisplayMan::loadBackPict(const char *fileName, uint16 *highPal) {
FadePalette = highPal; _fadePalette = highPal;
_vm->_anim->_noPalChange = true; _vm->_anim->_noPalChange = true;
readPict(fileName, true); readPict(fileName, true);
@ -1194,13 +1194,13 @@ void DisplayMan::fade(bool fadeIn, uint16 res) {
for (uint16 i = 0; i < 16; i++) { for (uint16 i = 0; i < 16; i++) {
for (uint16 palIdx = 0; palIdx < 16; palIdx++) { for (uint16 palIdx = 0; palIdx < 16; palIdx++) {
if (fadeIn) if (fadeIn)
newPal[palIdx] = (0x00F & fadeNumIn(0x00F & FadePalette[palIdx], 0x00F & res, i)) + newPal[palIdx] = (0x00F & fadeNumIn(0x00F & _fadePalette[palIdx], 0x00F & res, i)) +
(0x0F0 & fadeNumIn(0x0F0 & FadePalette[palIdx], 0x0F0 & res, i)) + (0x0F0 & fadeNumIn(0x0F0 & _fadePalette[palIdx], 0x0F0 & res, i)) +
(0xF00 & fadeNumIn(0xF00 & FadePalette[palIdx], 0xF00 & res, i)); (0xF00 & fadeNumIn(0xF00 & _fadePalette[palIdx], 0xF00 & res, i));
else else
newPal[palIdx] = (0x00F & fadeNumOut(0x00F & FadePalette[palIdx], 0x00F & res, i)) + newPal[palIdx] = (0x00F & fadeNumOut(0x00F & _fadePalette[palIdx], 0x00F & res, i)) +
(0x0F0 & fadeNumOut(0x0F0 & FadePalette[palIdx], 0x0F0 & res, i)) + (0x0F0 & fadeNumOut(0x0F0 & _fadePalette[palIdx], 0x0F0 & res, i)) +
(0xF00 & fadeNumOut(0xF00 & FadePalette[palIdx], 0xF00 & res, i)); (0xF00 & fadeNumOut(0xF00 & _fadePalette[palIdx], 0xF00 & res, i));
} }
setAmigaPal(newPal, 16); setAmigaPal(newPal, 16);

2
engines/lab/dispman.h
View file

@ -158,7 +158,7 @@ public:
byte *_displayBuffer; byte *_displayBuffer;
byte *_currentDisplayBuffer; byte *_currentDisplayBuffer;
bool _doNotDrawMessage; bool _doNotDrawMessage;
uint16 *FadePalette; uint16 *_fadePalette;
BitMap *_dispBitMap; BitMap *_dispBitMap;
}; };

2
engines/lab/intro.cpp
View file

@ -271,7 +271,7 @@ void Intro::introSequence() {
nReadPict("TNDcycle2.pic", true); nReadPict("TNDcycle2.pic", true);
_vm->_anim->_noPalChange = false; _vm->_anim->_noPalChange = false;
_vm->_graphics->FadePalette = palette; _vm->_graphics->_fadePalette = palette;
for (uint16 i = 0; i < 16; i++) { for (uint16 i = 0; i < 16; i++) {
if (_quitIntro) if (_quitIntro)

2
engines/lab/map.cpp
View file

@ -592,7 +592,7 @@ void LabEngine::doMap(uint16 curRoom) {
0x0AAA, 0x0ED0, 0x0EEE, 0x0694 0x0AAA, 0x0ED0, 0x0EEE, 0x0694
}; };
_graphics->FadePalette = amigaMapPalette; _graphics->_fadePalette = amigaMapPalette;
_music->updateMusic(); _music->updateMusic();
loadMapData(); loadMapData();

2
engines/lab/special.cpp
View file

@ -499,7 +499,7 @@ void LabEngine::doMonitor(char *background, char *textfile, bool isinteractive,
_monitorPage = 0; _monitorPage = 0;
_lastPage = false; _lastPage = false;
_graphics->FadePalette = _highPalette; _graphics->_fadePalette = _highPalette;
TextFont *monitorFont = _resource->getFont("P:Map.fon"); TextFont *monitorFont = _resource->getFont("P:Map.fon");
Common::File *buttonFile = _resource->openDataFile("P:MonImage"); Common::File *buttonFile = _resource->openDataFile("P:MonImage");