diff options
| author | Filippos Karapetis | 2016-01-14 01:31:27 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2016-01-14 23:41:32 +0200 |
| commit | 816381bbfed1b8d8a3305506d5e007e7fc0969c2 (patch) | |
| tree | 3145aa53a599ea691f2c5d985da5079c49d08cee /engines/lab | |
| parent | 0f45658259db4209cbaddb697e6223d7adc59873 (diff) | |
| download | scummvm-rg350-816381bbfed1b8d8a3305506d5e007e7fc0969c2.tar.gz scummvm-rg350-816381bbfed1b8d8a3305506d5e007e7fc0969c2.tar.bz2 scummvm-rg350-816381bbfed1b8d8a3305506d5e007e7fc0969c2.zip | |
LAB: Move frame waiting outside setAmigaPal()
Diffstat (limited to 'engines/lab')
| -rw-r--r-- | engines/lab/dispman.cpp | 18 | ||||
| -rw-r--r-- | engines/lab/intro.cpp | 1 |
2 files changed, 11 insertions, 8 deletions
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp index 8be1772826..e4bef24f5f 100644 --- a/engines/lab/dispman.cpp +++ b/engines/lab/dispman.cpp @@ -437,7 +437,6 @@ void DisplayMan::setAmigaPal(uint16 *pal) { } writeColorRegs(vgaPal, 0, 16); - _vm->waitTOF(); } void DisplayMan::writeColorRegs(byte *buf, uint16 first, uint16 numReg) { @@ -933,18 +932,21 @@ void DisplayMan::fade(bool fadeIn) { for (int i = 0; i < 16; i++) { for (int palIdx = 0; palIdx < 16; palIdx++) { if (fadeIn) - newPal[palIdx] = (0x00F & fadeNumIn(0x00F & _fadePalette[palIdx], 0, i)) + - (0x0F0 & fadeNumIn(0x0F0 & _fadePalette[palIdx], 0, i)) + - (0xF00 & fadeNumIn(0xF00 & _fadePalette[palIdx], 0, i)); + newPal[palIdx] = + (0x00F & fadeNumIn(0x00F & _fadePalette[palIdx], 0, i)) + + (0x0F0 & fadeNumIn(0x0F0 & _fadePalette[palIdx], 0, i)) + + (0xF00 & fadeNumIn(0xF00 & _fadePalette[palIdx], 0, i)); else - newPal[palIdx] = (0x00F & fadeNumOut(0x00F & _fadePalette[palIdx], 0, i)) + - (0x0F0 & fadeNumOut(0x0F0 & _fadePalette[palIdx], 0, i)) + - (0xF00 & fadeNumOut(0xF00 & _fadePalette[palIdx], 0, i)); + newPal[palIdx] = + (0x00F & fadeNumOut(0x00F & _fadePalette[palIdx], 0, i)) + + (0x0F0 & fadeNumOut(0x0F0 & _fadePalette[palIdx], 0, i)) + + (0xF00 & fadeNumOut(0xF00 & _fadePalette[palIdx], 0, i)); } setAmigaPal(newPal); - _vm->waitTOF(); _vm->updateEvents(); + _vm->waitTOF(); + _vm->waitTOF(); } } diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp index 4988e76a8d..01e8cac401 100644 --- a/engines/lab/intro.cpp +++ b/engines/lab/intro.cpp @@ -273,6 +273,7 @@ void Intro::play() { _vm->_graphics->setAmigaPal(palette); _vm->waitTOF(); + _vm->waitTOF(); } if (!_quitIntro) { |