libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 17:29:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DRASCULA: Handle pitch in code using lockScreen()

Browse Source 
The surface returned by OSystem::lockScreen() can have a pitch which
differs from w * bytesPerPixel, so modify the code to take this into
account.  Fixes FMV problems on Dreamcast.
This commit is contained in:
Marcus Comstedt 2011-05-04 23:54:57 +02:00
parent db22f32a44
commit 379b3104a4
2 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/drascula/drascula.h
View File

@ -573,8 +573,8 @@ public:
void enterName();
bool soundIsActive();
void waitFrameSSN();
void mixVideo(byte *OldScreen, byte *NewScreen);
void decodeRLE(byte *BufferRLE, byte *MiVideoRLE);
void mixVideo(byte *OldScreen, byte *NewScreen, uint16 oldPitch);
void decodeRLE(byte *BufferRLE, byte *MiVideoRLE, uint16 pitch = 320);
void decodeOffset(byte *BufferOFF, byte *MiVideoOFF, int length);
int playFrameSSN(Common::SeekableReadStream *stream);

61
engines/drascula/graphics.cpp
View File

@ -134,14 +134,18 @@ void DrasculaEngine::showFrame(Common::SeekableReadStream *stream, bool firstFra
}
byte *prevFrame = (byte *)malloc(64000);
byte *screenBuffer = (byte *)_system->lockScreen()->pixels;
memcpy(prevFrame, screenBuffer, 64000);
Graphics::Surface *screenSurf = _system->lockScreen();
byte *screenBuffer = (byte *)screenSurf->pixels;
uint16 screenPitch = screenSurf->pitch;
for (int y = 0; y < 200; y++) {
memcpy(prevFrame+y*320, screenBuffer+y*screenPitch, 320);
}
decodeRLE(pcxData, screenBuffer);
decodeRLE(pcxData, screenBuffer, screenPitch);
free(pcxData);
if (!firstFrame)
mixVideo(screenBuffer, prevFrame);
mixVideo(screenBuffer, prevFrame, screenPitch);
_system->unlockScreen();
_system->updateScreen();
@ -446,7 +450,9 @@ void DrasculaEngine::screenSaver() {
int x1_, y1_, off1, off2;
byte *screenBuffer = (byte *)_system->lockScreen()->pixels;
Graphics::Surface *screenSurf = _system->lockScreen();
byte *screenBuffer = (byte *)screenSurf->pixels;
uint16 screenPitch = screenSurf->pitch;
for (int i = 0; i < 200; i++) {
for (int j = 0; j < 320; j++) {
x1_ = j + tempRow[i];
@ -464,7 +470,7 @@ void DrasculaEngine::screenSaver() {
y1_ = checkWrapY(y1_);
off2 = 320 * y1_ + x1_;
screenBuffer[320 * i + j] = ghost[bgSurface[off2] + (copia[off1] << 8)];
screenBuffer[screenPitch * i + j] = ghost[bgSurface[off2] + (copia[off1] << 8)];
}
}
@ -533,11 +539,14 @@ int DrasculaEngine::playFrameSSN(Common::SeekableReadStream *stream) {
free(BufferSSN);
waitFrameSSN();
byte *screenBuffer = (byte *)_system->lockScreen()->pixels;
Graphics::Surface *screenSurf = _system->lockScreen();
byte *screenBuffer = (byte *)screenSurf->pixels;
uint16 screenPitch = screenSurf->pitch;
if (FrameSSN)
mixVideo(screenBuffer, screenSurface);
mixVideo(screenBuffer, screenSurface, screenPitch);
else
memcpy(screenBuffer, screenSurface, 64000);
for (int y = 0; y < 200; y++)
memcpy(screenBuffer+y*screenPitch, screenSurface+y*320, 320);
_system->unlockScreen();
_system->updateScreen();
@ -549,11 +558,14 @@ int DrasculaEngine::playFrameSSN(Common::SeekableReadStream *stream) {
decodeOffset(BufferSSN, screenSurface, length);
free(BufferSSN);
waitFrameSSN();
byte *screenBuffer = (byte *)_system->lockScreen()->pixels;
Graphics::Surface *screenSurf = _system->lockScreen();
byte *screenBuffer = (byte *)screenSurf->pixels;
uint16 screenPitch = screenSurf->pitch;
if (FrameSSN)
mixVideo(screenBuffer, screenSurface);
mixVideo(screenBuffer, screenSurface, screenPitch);
else
memcpy(screenBuffer, screenSurface, 64000);
for (int y = 0; y < 200; y++)
memcpy(screenBuffer+y*screenPitch, screenSurface+y*320, 320);
_system->unlockScreen();
_system->updateScreen();
@ -589,11 +601,12 @@ void DrasculaEngine::decodeOffset(byte *BufferOFF, byte *MiVideoOFF, int length)
}
}
void DrasculaEngine::decodeRLE(byte* srcPtr, byte* dstPtr) {
void DrasculaEngine::decodeRLE(byte* srcPtr, byte* dstPtr, uint16 pitch) {
bool stopProcessing = false;
byte pixel;
uint repeat;
int curByte = 0;
int curByte = 0, curLine = 0;
pitch -= 320;
while (!stopProcessing) {
pixel = *srcPtr++;
@ -604,17 +617,25 @@ void DrasculaEngine::decodeRLE(byte* srcPtr, byte* dstPtr) {
}
for (uint j = 0; j < repeat; j++) {
*dstPtr++ = pixel;
if (++curByte >= 64000) {
stopProcessing = true;
break;
if (++curByte >= 320) {
curByte = 0;
dstPtr += pitch;
if (++curLine >= 200) {
stopProcessing = true;
break;
}
}
}
}
}
void DrasculaEngine::mixVideo(byte *OldScreen, byte *NewScreen) {
for (int x = 0; x < 64000; x++)
OldScreen[x] ^= NewScreen[x];
void DrasculaEngine::mixVideo(byte *OldScreen, byte *NewScreen, uint16 oldPitch) {
for (int y = 0; y < 200; y++) {
for (int x = 0; x < 320; x++)
OldScreen[x] ^= NewScreen[x];
OldScreen += oldPitch;
NewScreen += 320;
}
}
void DrasculaEngine::waitFrameSSN() {