aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2015-12-14 08:59:16 +0100
committerWillem Jan Palenstijn2015-12-23 21:34:04 +0100
commitaa718e4c842722e76d035d7ed63e5e08ff6b67cf (patch)
tree07b714eb13c47585d365b379d69fa7decf5d0ad8
parent5d240e3493a16c96cbded4669ba40fe0e86a593d (diff)
downloadscummvm-rg350-aa718e4c842722e76d035d7ed63e5e08ff6b67cf.tar.gz
scummvm-rg350-aa718e4c842722e76d035d7ed63e5e08ff6b67cf.tar.bz2
scummvm-rg350-aa718e4c842722e76d035d7ed63e5e08ff6b67cf.zip
LAB: Variable rename
-rw-r--r--engines/lab/dispman.cpp16
-rw-r--r--engines/lab/dispman.h2
-rw-r--r--engines/lab/intro.cpp2
-rw-r--r--engines/lab/map.cpp2
-rw-r--r--engines/lab/special.cpp2
5 files changed, 12 insertions, 12 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);
diff --git a/engines/lab/dispman.h b/engines/lab/dispman.h
index 58a517eb31..8b77dc8ab8 100644
--- a/engines/lab/dispman.h
+++ b/engines/lab/dispman.h
@@ -158,7 +158,7 @@ public:
byte *_displayBuffer;
byte *_currentDisplayBuffer;
bool _doNotDrawMessage;
- uint16 *FadePalette;
+ uint16 *_fadePalette;
BitMap *_dispBitMap;
};
diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
index 7c77e8a18b..b08539711f 100644
--- a/engines/lab/intro.cpp
+++ b/engines/lab/intro.cpp
@@ -271,7 +271,7 @@ void Intro::introSequence() {
nReadPict("TNDcycle2.pic", true);
_vm->_anim->_noPalChange = false;
- _vm->_graphics->FadePalette = palette;
+ _vm->_graphics->_fadePalette = palette;
for (uint16 i = 0; i < 16; i++) {
if (_quitIntro)
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index f8207ad844..cb222ba989 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -592,7 +592,7 @@ void LabEngine::doMap(uint16 curRoom) {
0x0AAA, 0x0ED0, 0x0EEE, 0x0694
};
- _graphics->FadePalette = amigaMapPalette;
+ _graphics->_fadePalette = amigaMapPalette;
_music->updateMusic();
loadMapData();
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index 5bb9b17be3..65a4a9d566 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -499,7 +499,7 @@ void LabEngine::doMonitor(char *background, char *textfile, bool isinteractive,
_monitorPage = 0;
_lastPage = false;
- _graphics->FadePalette = _highPalette;
+ _graphics->_fadePalette = _highPalette;
TextFont *monitorFont = _resource->getFont("P:Map.fon");
Common::File *buttonFile = _resource->openDataFile("P:MonImage");