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

minor cleanup

Browse source 
svn-id: r17692
This commit is contained in:
Gregory Montoir 2005-04-19 17:55:09 +00:00
parent d85f6d1688
commit 7c110ef819
5 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scumm/script_v100he.cpp
View file

@ -1147,8 +1147,8 @@ void ScummEngine_v100he::o100_wizImageOps() {
_wizParams.img.x1 = pop(); _wizParams.img.x1 = pop();
break; break;
case 7: case 7:
_wizParams.processFlags |= 0x80000; _wizParams.processFlags |= kWPFMaskImg;
_wizParams.unk_178 = pop(); _wizParams.maskImgResNum = pop();
break; break;
case 11: case 11:
_wizParams.processFlags |= kWPFClipBox | 0x100; _wizParams.processFlags |= kWPFClipBox | 0x100;

4
scumm/script_v90he.cpp
View file

@ -586,8 +586,8 @@ void ScummEngine_v90he::o90_wizImageOps() {
_wizParams.img.flags = 0; _wizParams.img.flags = 0;
break; break;
case 16: // HE99+ case 16: // HE99+
_wizParams.processFlags |= 0x80000; _wizParams.processFlags |= kWPFMaskImg;
_wizParams.unk_178 = pop(); _wizParams.maskImgResNum = pop();
break; break;
case 19: case 19:
_wizParams.processFlags |= kWPFSetPos; _wizParams.processFlags |= kWPFSetPos;

4
scumm/sprite_he.cpp
View file

@ -1335,8 +1335,8 @@ void ScummEngine_v90he::spritesProcessWiz(bool arg) {
if (spr_flags & kSFNeedPaletteRemap) if (spr_flags & kSFNeedPaletteRemap)
wiz.img.flags |= kWIFRemapPalette; wiz.img.flags |= kWIFRemapPalette;
if (spi->field_7C) { if (spi->field_7C) {
wiz.processFlags |= 0x80000; wiz.processFlags |= kWPFMaskImg;
wiz.unk_178 = spi->field_7C; wiz.maskImgResNum = spi->field_7C;
} }
wiz.processFlags |= kWPFNewFlags; wiz.processFlags |= kWPFNewFlags;

17
scumm/wiz_he.cpp
View file

@ -995,7 +995,7 @@ uint8 *ScummEngine_v72he::drawWizImage(int resNum, int state, int x1, int y1, in
} else { } else {
return 0; return 0;
} }
} else if (_wiz._rectOverrideEnabled == true) { } else if (_wiz._rectOverrideEnabled) {
if (rScreen.intersects(_wiz._rectOverride)) { if (rScreen.intersects(_wiz._rectOverride)) {
rScreen.clip(_wiz._rectOverride); rScreen.clip(_wiz._rectOverride);
} else { } else {
@ -1149,10 +1149,9 @@ void ScummEngine_v72he::drawWizComplexPolygon(int resNum, int state, int po_x, i
} else { } else {
warning("drawWizComplexPolygon() angle partially implemented"); warning("drawWizComplexPolygon() angle partially implemented");
angle %= 360;
if (angle < 0) { if (angle < 0) {
angle = 360 - (angle / 360); angle += 360;
} else {
angle /= 360;
} }
Common::Rect bounds; Common::Rect bounds;
@ -1339,9 +1338,9 @@ void ScummEngine_v80he::loadWizCursor(int resId) {
} }
void ScummEngine_v72he::displayWizComplexImage(const WizParameters *params) { void ScummEngine_v72he::displayWizComplexImage(const WizParameters *params) {
int unk_178 = 0; int maskImgResNum = 0;
if (params->processFlags & 0x80000) { if (params->processFlags & kWPFMaskImg) {
unk_178 = params->unk_178; maskImgResNum = params->maskImgResNum;
warning("displayWizComplexImage() unhandled flag 0x80000"); warning("displayWizComplexImage() unhandled flag 0x80000");
} }
int paletteNum = 0; int paletteNum = 0;
@ -1399,7 +1398,7 @@ void ScummEngine_v72he::displayWizComplexImage(const WizParameters *params) {
} }
if (_fullRedraw && dstResNum == 0) { if (_fullRedraw && dstResNum == 0) {
if (unk_178 != 0 || (params->processFlags & (kWPFZoom | kWPFRotate))) if (maskImgResNum != 0 || (params->processFlags & (kWPFZoom | kWPFRotate)))
error("Can't do this command in the enter script."); error("Can't do this command in the enter script.");
assert(_wiz._imagesNum < ARRAYSIZE(_wiz._images)); assert(_wiz._imagesNum < ARRAYSIZE(_wiz._images));
@ -1413,7 +1412,7 @@ void ScummEngine_v72he::displayWizComplexImage(const WizParameters *params) {
pwi->paletteNum = paletteNum; pwi->paletteNum = paletteNum;
++_wiz._imagesNum; ++_wiz._imagesNum;
} else { } else {
if (unk_178 != 0) { if (maskImgResNum != 0) {
// TODO // TODO
} else if (params->processFlags & (kWPFZoom | kWPFRotate)) { } else if (params->processFlags & (kWPFZoom | kWPFRotate)) {
drawWizComplexPolygon(params->img.resNum, state, po_x, po_y, xmapNum, rotationAngle, zoom, r, flags, dstResNum, paletteNum); drawWizComplexPolygon(params->img.resNum, state, po_x, po_y, xmapNum, rotationAngle, zoom, r, flags, dstResNum, paletteNum);

5
scumm/wiz_he.h
View file

@ -67,7 +67,7 @@ struct WizParameters {
int unk_164; int unk_164;
int resDefImgW; int resDefImgW;
int resDefImgH; int resDefImgH;
int unk_178; int maskImgResNum;
uint8 remapColor[256]; uint8 remapColor[256];
uint8 remapIndex[256]; uint8 remapIndex[256];
int remapNum; int remapNum;
@ -103,7 +103,8 @@ enum WizProcessFlags {
kWPFPaletteNum = 0x8000, kWPFPaletteNum = 0x8000,
kWPFDstResNum = 0x10000, kWPFDstResNum = 0x10000,
kWPFFillColor = 0x20000, kWPFFillColor = 0x20000,
kWPFClipBox2 = 0x40000 kWPFClipBox2 = 0x40000,
kWPFMaskImg = 0x80000
}; };
struct Wiz { struct Wiz {