aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2005-02-25 11:45:25 +0000
committerTravis Howell2005-02-25 11:45:25 +0000
commit475b1e139594cc784c9b5c91aa5af6bd919611e7 (patch)
tree83f3d69822c6d45e5c815a34f29645412d0245ea
parent563b271224935f3a7649642cd9505f1ebb266853 (diff)
downloadscummvm-rg350-475b1e139594cc784c9b5c91aa5af6bd919611e7.tar.gz
scummvm-rg350-475b1e139594cc784c9b5c91aa5af6bd919611e7.tar.bz2
scummvm-rg350-475b1e139594cc784c9b5c91aa5af6bd919611e7.zip
Update WizParameters struct, to match pajama3.
svn-id: r16912
-rw-r--r--scumm/sprite_he.cpp7
-rw-r--r--scumm/wiz_he.cpp2
-rw-r--r--scumm/wiz_he.h6
3 files changed, 10 insertions, 5 deletions
diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index e2097df2b6..1ac7a21e61 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -1215,7 +1215,6 @@ void ScummEngine_v90he::spritesProcessWiz(bool arg) {
pts[0].x = pts[0].y = pts[1].y = pts[3].x = -w / 2;
pts[2].y = pts[3].y = h / 2 - 1;
- // transform points
if (spi->flags & kSFZoomed) {
for (int j = 0; j < 4; ++j) {
pts[j].x = pts[i].x * zoom / 256;
@@ -1257,7 +1256,7 @@ void ScummEngine_v90he::spritesProcessWiz(bool arg) {
wiz.img.flags |= 2;
if (spi->field_7C) {
wiz.processFlags |= 0x80000;
- //wiz.field_178 = spi->field_7C; // FIXME
+ wiz.unk_178 = spi->field_7C;
}
wiz.processFlags |= kWPFNewFlags;
@@ -1286,11 +1285,11 @@ void ScummEngine_v90he::spritesProcessWiz(bool arg) {
}
if (spi->field_14) {
wiz.processFlags |= 0x8000;
- //wiz.field_174 = spi->field_14; // FIXME
+ wiz.unk_174 = spi->field_14;
}
if (spi->res_id && spi->group_num && _spriteGroups[spi->group_num].field_20) {
wiz.processFlags |= 0x1000;
- //wiz.field_380 = _spriteGroups[spi->group_num].field_20; // FIXME
+ wiz.unk_380 = _spriteGroups[spi->group_num].field_20;
}
displayWizComplexImage(&wiz);
}
diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp
index 8e5facbce5..b8470b7533 100644
--- a/scumm/wiz_he.cpp
+++ b/scumm/wiz_he.cpp
@@ -88,7 +88,7 @@ void Wiz::polygonStore(int id, bool flag, int vert1x, int vert1y, int vert2x, in
wp->vert[4].x = vert1x;
wp->vert[4].y = vert1y;
wp->id = id;
- wp->numVerts = 5;
+ wp->numVerts = 5;
wp->flag = flag;
polygonCalcBoundBox(wp->vert, wp->numVerts, wp->bound);
diff --git a/scumm/wiz_he.h b/scumm/wiz_he.h
index bb7dd7dae0..33181200f7 100644
--- a/scumm/wiz_he.h
+++ b/scumm/wiz_he.h
@@ -63,9 +63,15 @@ struct WizParameters {
int zoom;
int unk_15C;
int unk_160;
+ int unk_164;
+ int unk_16C;
+ int unk_170;
+ int unk_174;
+ int unk_178;
uint8 remapColor[256];
uint8 remapIndex[256];
int remapNum;
+ int unk_380;
WizImage img;
};