[Scummvm-cvs-logs] SF.net SVN: scummvm: [32616] scummvm/trunk/engines/drascula
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sun Jun 8 16:17:35 CEST 2008
Revision: 32616
http://scummvm.svn.sourceforge.net/scummvm/?rev=32616&view=rev
Author: thebluegr
Date: 2008-06-08 07:17:35 -0700 (Sun, 08 Jun 2008)
Log Message:
-----------
Use mixVideo() in showFrame() and some capitalization fixes
Modified Paths:
--------------
scummvm/trunk/engines/drascula/drascula.h
scummvm/trunk/engines/drascula/graphics.cpp
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2008-06-08 14:11:22 UTC (rev 32615)
+++ scummvm/trunk/engines/drascula/drascula.h 2008-06-08 14:17:35 UTC (rev 32616)
@@ -462,8 +462,8 @@
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();
Modified: scummvm/trunk/engines/drascula/graphics.cpp
===================================================================
--- scummvm/trunk/engines/drascula/graphics.cpp 2008-06-08 14:11:22 UTC (rev 32615)
+++ scummvm/trunk/engines/drascula/graphics.cpp 2008-06-08 14:17:35 UTC (rev 32616)
@@ -151,10 +151,8 @@
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 @@
setPalette(dacSSN);
break;
case kFrameEmptyFrame:
- WaitFrameSSN();
+ waitFrameSSN();
break;
case kFrameInit:
if (!UsingMem) {
@@ -554,9 +552,9 @@
}
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 @@
}
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::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));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list