ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCUMM HE: Further work on T14 codec

Browse Source
This commit is contained in:
Eugene Sandulenko
2016-05-01 16:51:08 +02:00
parent b5cf66eb86
commit fcdbd2c066
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/scumm/he/moonbase/moonbase.cpp
+4
View File
@@ -37,4 +37,8 @@ void Moonbase::renderFOW() {
warning("STUB: renderFOW()");
}
void Moonbase::blitT14WizImage(uint8 *dst, int dstw, int dsth, int dstPitch, const Common::Rect *clipBox,
uint8 *wizd, int srcx, int srcy, int rawROP, int paramROP) {
}
} // End of namespace Scumm
engines/scumm/he/moonbase/moonbase.h
+3
View File
@@ -34,6 +34,9 @@ public:
void renderFOW();
void blitT14WizImage(uint8 *dst, int dstw, int dsth, int dstPitch, const Common::Rect *clipBox,
uint8 *wizd, int srcx, int srcy, int rawROP, int paramROP);
public:
int _fowSentinelImage;
int _fowSentinelState;
engines/scumm/he/wiz_he.cpp
+14 -4
View File
@@ -1635,7 +1635,7 @@ void Wiz::drawWizImageEx(uint8 *dst, uint8 *dataPtr, uint8 *maskPtr, int dstPitc
copy16BitWizImage(dst, wizd, dstPitch, dstType, dstw, dsth, srcx, srcy, srcw, srch, rect, flags, xmapPtr);
break;
case 9:
copyT14WizImage(dst, wizd, dstPitch, dstType, dstw, dsth, srcx, srcy, rect, conditionBits);
copy555WizImage(dst, wizd, dstPitch, dstType, dstw, dsth, srcx, srcy, rect, conditionBits);
break;
#endif
default:
@@ -1764,11 +1764,11 @@ void Wiz::copyCompositeWizImage(uint8 *dst, uint8 *wizPtr, uint8 *compositeInfoB
}
}
void Wiz::copyT14WizImage(uint8 *dst, uint8 *wizd, int dstPitch, int dstType,
void Wiz::copy555WizImage(uint8 *dst, uint8 *wizd, int dstPitch, int dstType,
int dstw, int dsth, int srcx, int srcy, const Common::Rect *clipBox, uint16 conditionBits) {
int rawROP = conditionBits & kWMSBRopMask;
int nROPParam = (conditionBits & kWMSBReservedBits) >> kWMSBRopParamRShift;
int paramROP = (conditionBits & kWMSBReservedBits) >> kWMSBRopParamRShift;
switch (rawROP) {
default:
@@ -1801,7 +1801,17 @@ void Wiz::copyT14WizImage(uint8 *dst, uint8 *wizd, int dstPitch, int dstType,
break;
}
warning("T14: params %d", nROPParam);
uint32 compID = READ_LE_UINT32(wizd);
if (compID == 0x12340102) {
_vm->_moonbase->blitT14WizImage(dst, dstw, dsth, dstPitch, clipBox, wizd, srcx, srcy, rawROP, paramROP);
} else if (compID == 0x12340802) {
warning("Distorion codec");
} else if (compID == 0x12340902) {
error("Unsupported Distortion");
}
}
#endif
engines/scumm/he/wiz_he.h
+1 -1
View File
@@ -250,7 +250,7 @@ public:
void copyCompositeWizImage(uint8 *dst, uint8 *wizPtr, uint8 *wizd, uint8 *maskPtr, int dstPitch, int dstType,
int dstw, int dsth, int srcx, int srcy, int srcw, int srch, int state, const Common::Rect *clipBox,
int flags, const uint8 *palPtr, int transColor, uint8 bitDepth, const uint8 *xmapPtr, uint16 conditionBits);
void copyT14WizImage(uint8 *dst, uint8 *wizd, int dstPitch, int dstType,
void copy555WizImage(uint8 *dst, uint8 *wizd, int dstPitch, int dstType,
int dstw, int dsth, int srcx, int srcy, const Common::Rect *clipBox, uint16 conditionBits);
#endif