thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix endian issue in copyFrameToBuffer().

Browse source 
svn-id: r43633
This commit is contained in:
Travis Howell 2009-08-22 09:39:55 +00:00
parent 6c6ae69f3d
commit bed502a7c7
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
engines/scumm/he/animation_he.cpp
View file

@ -66,7 +66,7 @@ int MoviePlayer::load(const char *filename, int flags, int image) {
return 0; return 0;
} }
void MoviePlayer::copyFrameToBuffer(byte *dst, uint x, uint y, uint pitch) { void MoviePlayer::copyFrameToBuffer(byte *dst, int dstType, uint x, uint y, uint pitch) {
uint h = getHeight(); uint h = getHeight();
uint w = getWidth(); uint w = getWidth();
@ -76,8 +76,17 @@ void MoviePlayer::copyFrameToBuffer(byte *dst, uint x, uint y, uint pitch) {
dst += y * pitch + x * 2; dst += y * pitch + x * 2;
do { do {
for (uint i = 0; i < w; i++) { for (uint i = 0; i < w; i++) {
uint16 col = READ_LE_UINT16(_vm->_hePalettes + _vm->_hePaletteSlot + 768 + src[i] * 2); uint16 color = READ_LE_UINT16(_vm->_hePalettes + _vm->_hePaletteSlot + 768 + src[i] * 2);
WRITE_UINT16(dst + i * 2, col); switch (dstType) {
case kDstScreen:
WRITE_UINT16(dst + i * 2, color);
break;
case kDstResource:
WRITE_LE_UINT16(dst + i * 2, color);
break;
default:
error("copyFrameToBuffer: Unknown dstType %d", dstType);
}
} }
dst += pitch; dst += pitch;
src += w; src += w;
@ -106,14 +115,14 @@ void MoviePlayer::handleNextFrame() {
assert(dstPtr); assert(dstPtr);
uint8 *dst = _vm->findWrappedBlock(MKID_BE('WIZD'), dstPtr, 0, 0); uint8 *dst = _vm->findWrappedBlock(MKID_BE('WIZD'), dstPtr, 0, 0);
assert(dst); assert(dst);
copyFrameToBuffer(dst, 0, 0, _vm->_screenWidth * _vm->_bitDepth); copyFrameToBuffer(dst, kDstResource, 0, 0, _vm->_screenWidth * _vm->_bitDepth);
} else if (_flags & 1) { } else if (_flags & 1) {
copyFrameToBuffer(pvs->getBackPixels(0, 0), 0, 0, pvs->pitch); copyFrameToBuffer(pvs->getBackPixels(0, 0), kDstScreen, 0, 0, pvs->pitch);
Common::Rect imageRect(getWidth(), getHeight()); Common::Rect imageRect(getWidth(), getHeight());
_vm->restoreBackgroundHE(imageRect); _vm->restoreBackgroundHE(imageRect);
} else { } else {
copyFrameToBuffer(pvs->getPixels(0, 0), 0, 0, pvs->pitch); copyFrameToBuffer(pvs->getPixels(0, 0), kDstScreen, 0, 0, pvs->pitch);
Common::Rect imageRect(getWidth(), getHeight()); Common::Rect imageRect(getWidth(), getHeight());
_vm->markRectAsDirty(kMainVirtScreen, imageRect); _vm->markRectAsDirty(kMainVirtScreen, imageRect);

2
engines/scumm/he/animation_he.h
View file

@ -54,7 +54,7 @@ public:
int getImageNum(); int getImageNum();
int load(const char *filename, int flags, int image = 0); int load(const char *filename, int flags, int image = 0);
void copyFrameToBuffer(byte *dst, uint x, uint y, uint pitch); void copyFrameToBuffer(byte *dst, int dstType, uint x, uint y, uint pitch);
void handleNextFrame(); void handleNextFrame();
protected: protected: