libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

JANITORIAL: Indentation fixes

Browse Source
This commit is contained in:
Eugene Sandulenko 2016-05-13 12:27:11 +02:00
parent e1c13af2f8
commit 6aec69231f
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backends/platform/sdl/amigaos/amigaos-main.cpp
View File

@ -49,15 +49,15 @@ int main(int argc, char *argv[]) {
sizeof(progpath),
DN_FULLPATH)) {
// Stop any "Insert volume..." type requesters
oldwin = IDOS->SetProcWindow((APTR)-1);
// Stop any "Insert volume..." type requesters
oldwin = IDOS->SetProcWindow((APTR)-1);
// Finally, set the variable to the path the executable was run from
IDOS->AddPart( apppath, appname, 1024);
IDOS->SetVar( apppath, progpath, -1, GVF_GLOBAL_ONLY|GVF_SAVE_VAR );
// Finally, set the variable to the path the executable was run from
IDOS->AddPart( apppath, appname, 1024);
IDOS->SetVar( apppath, progpath, -1, GVF_GLOBAL_ONLY|GVF_SAVE_VAR );
// Turn system requesters back on
IDOS->SetProcWindow( oldwin );
// Turn system requesters back on
IDOS->SetProcWindow( oldwin );
}
}

19
engines/scumm/he/wiz_he.cpp
View File

@ -1615,6 +1615,10 @@ void Wiz::drawWizImageEx(uint8 *dst, uint8 *dataPtr, uint8 *maskPtr, int dstPitc
uint8 *wizd = _vm->findWrappedBlock(MKTAG('W','I','Z','D'), dataPtr, state, 0);
assert(wizd);
if (srcw == srch && srcw == 30) {
warning("FOG: comp %d bits: %x", comp, conditionBits);
}
switch (comp) {
case 0:
copyRawWizImage(dst, wizd, dstPitch, dstType, dstw, dsth, srcx, srcy, srcw, srch, rect, flags, palPtr, transColor, bitDepth);
@ -1682,12 +1686,20 @@ void Wiz::copyCompositeWizImage(uint8 *dst, uint8 *wizPtr, uint8 *compositeInfoB
uint32 layerCmdDataBits = READ_LE_UINT32(cmdPtr);
cmdPtr += 4;
if (srcw == srch && srcw == 30) {
warning("layerbits: %x", layerCmdDataBits);
}
uint32 subConditionBits;
if (layerCmdDataBits & kWCFConditionBits) {
uint32 layerConditionBits = READ_LE_UINT32(cmdPtr);
cmdPtr += 4;
if (srcw == srch && srcw == 30) {
warning("layercondbits: %x", layerConditionBits);
}
subConditionBits = (layerConditionBits & kWMSBReservedBits);
layerConditionBits &= ~kWMSBReservedBits;
@ -1721,6 +1733,9 @@ void Wiz::copyCompositeWizImage(uint8 *dst, uint8 *wizPtr, uint8 *compositeInfoB
uint16 subState;
if (layerCmdDataBits & kWCFSubState) {
subState = READ_LE_UINT16(cmdPtr);
if (srcw == srch && srcw == 30) {
warning("state: %x substate: %x", state, subState);
}
cmdPtr += 2;
} else {
subState = 0;
@ -1769,6 +1784,10 @@ void Wiz::copyCompositeWizImage(uint8 *dst, uint8 *wizPtr, uint8 *compositeInfoB
cmdPtr += 4;
}
if (srcw == srch && srcw == 30) {
warning("subBits: %x", subConditionBits);
}
drawWizImageEx(dst, nestedWizHeader, maskPtr, dstPitch, dstType, dstw, dsth, srcx + xPos, srcy + yPos, srcw, srch,
subState, clipBox, drawFlags, palPtr, transColor, bitDepth, xmapPtr, subConditionBits);
}