diff options
| author | Filippos Karapetis | 2008-06-08 14:17:35 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-06-08 14:17:35 +0000 |
| commit | f45939a90a7ab90f661f005ad8e4d5bbc4cc6fcd (patch) | |
| tree | ffebb9d401f0dc4adfa2d6ebf33de1becc03de43 /engines | |
| parent | 1b233db8510870e5daabf80550bdff3ace668fef (diff) | |
| download | scummvm-rg350-f45939a90a7ab90f661f005ad8e4d5bbc4cc6fcd.tar.gz scummvm-rg350-f45939a90a7ab90f661f005ad8e4d5bbc4cc6fcd.tar.bz2 scummvm-rg350-f45939a90a7ab90f661f005ad8e4d5bbc4cc6fcd.zip | |
Use mixVideo() in showFrame() and some capitalization fixes
svn-id: r32616
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/drascula/drascula.h | 4 | ||||
| -rw-r--r-- | engines/drascula/graphics.cpp | 20 |
2 files changed, 11 insertions, 13 deletions
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h index 012b3d2695..fa9a036063 100644 --- a/engines/drascula/drascula.h +++ b/engines/drascula/drascula.h @@ -462,8 +462,8 @@ public: void setCursorTable(); void enterName(); bool soundIsActive(); - void WaitFrameSSN(); - void MixVideo(byte *OldScreen, byte *NewScreen); + void waitFrameSSN(); + void mixVideo(byte *OldScreen, byte *NewScreen); void Des_RLE(byte *BufferRLE, byte *MiVideoRLE); void Des_OFF(byte *BufferOFF, byte *MiVideoOFF, int Lenght); byte *TryInMem(); diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp index 343d885c54..533f7cc0c5 100644 --- a/engines/drascula/graphics.cpp +++ b/engines/drascula/graphics.cpp @@ -151,10 +151,8 @@ void DrasculaEngine::showFrame(bool firstFrame) { free(pcxData); - if (!firstFrame) { - for (int j = 0; j < 64000; j++) - VGA[j] = prevFrame[j] ^ VGA[j]; - } + if (!firstFrame) + mixVideo(VGA, prevFrame); _system->copyRectToScreen((const byte *)VGA, 320, 0, 0, 320, 200); _system->updateScreen(); @@ -532,7 +530,7 @@ int DrasculaEngine::playFrameSSN() { setPalette(dacSSN); break; case kFrameEmptyFrame: - WaitFrameSSN(); + waitFrameSSN(); break; case kFrameInit: if (!UsingMem) { @@ -554,9 +552,9 @@ int DrasculaEngine::playFrameSSN() { } Des_RLE(BufferSSN, MiVideoSSN); free(BufferSSN); - WaitFrameSSN(); + waitFrameSSN(); if (FrameSSN) - MixVideo(VGA, MiVideoSSN); + mixVideo(VGA, MiVideoSSN); else memcpy(VGA, MiVideoSSN, 64000); _system->copyRectToScreen((const byte *)VGA, 320, 0, 0, 320, 200); @@ -573,9 +571,9 @@ int DrasculaEngine::playFrameSSN() { } Des_OFF(BufferSSN, MiVideoSSN, Lengt); free(BufferSSN); - WaitFrameSSN(); + waitFrameSSN(); if (FrameSSN) - MixVideo(VGA, MiVideoSSN); + mixVideo(VGA, MiVideoSSN); else memcpy(VGA, MiVideoSSN, 64000); _system->copyRectToScreen((const byte *)VGA, 320, 0, 0, 320, 200); @@ -646,12 +644,12 @@ void DrasculaEngine::Des_RLE(byte *BufferRLE, byte *MiVideoRLE) { } } -void DrasculaEngine::MixVideo(byte *OldScreen, byte *NewScreen) { +void DrasculaEngine::mixVideo(byte *OldScreen, byte *NewScreen) { for (int x = 0; x < 64000; x++) OldScreen[x] ^= NewScreen[x]; } -void DrasculaEngine::WaitFrameSSN() { +void DrasculaEngine::waitFrameSSN() { uint32 now; while ((now = _system->getMillis()) - LastFrame < ((uint32) globalSpeed)) _system->delayMillis(globalSpeed - (now - LastFrame)); |