aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-09-15 01:56:42 +0000
committerTravis Howell2004-09-15 01:56:42 +0000
commit7f766fc2a55a792fbd1be2c5ed8752b8469ee9fc (patch)
tree3cb058945a46041a674fadfad88783dce47bffdc
parent5df545630bf31ddfea86bad9d909686bb3986f17 (diff)
downloadscummvm-rg350-7f766fc2a55a792fbd1be2c5ed8752b8469ee9fc.tar.gz
scummvm-rg350-7f766fc2a55a792fbd1be2c5ed8752b8469ee9fc.tar.bz2
scummvm-rg350-7f766fc2a55a792fbd1be2c5ed8752b8469ee9fc.zip
Only palette is different
svn-id: r15122
-rw-r--r--scumm/script_v72he.cpp8
-rw-r--r--scumm/script_v7he.cpp1
2 files changed, 3 insertions, 6 deletions
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index a2ebe964ac..71f6787af9 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -1361,7 +1361,7 @@ void ScummEngine_v72he::drawWizImage(int restype, int resnum, int state, int x1,
setPaletteFromPtr(pal, 256);
}
if (flags & 2) {
- warning("unhandled Wiz image w/ rmap");
+ warning("unhandled Wiz image w/ rmap palette");
}
if (flags & 4) {
warning("printing Wiz image is unimplemented");
@@ -1392,11 +1392,7 @@ void ScummEngine_v72he::drawWizImage(int restype, int resnum, int state, int x1,
dst = pvs->getBackPixels(0, pvs->topline);
}
Common::Rect rScreen(0, 0, pvs->w, pvs->h);
- if (flags & 2) {
- warning("unhandled Wiz image w/ rmap");
- } else {
- gdi.copyWizImage(dst, wizd, pvs->w, pvs->h, x1, y1, width, height, &rScreen);
- }
+ gdi.copyWizImage(dst, wizd, pvs->w, pvs->h, x1, y1, width, height, &rScreen);
Common::Rect rImage(x1, y1, x1 + width, y1 + height);
if (rImage.intersects(rScreen)) {
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp
index e72fadd1a2..9aa2baf9c8 100644
--- a/scumm/script_v7he.cpp
+++ b/scumm/script_v7he.cpp
@@ -761,6 +761,7 @@ void ScummEngine_v7he::o7_kernelSetFunctions() {
num = getStackList(args, ARRAYSIZE(args));
+ debug(1, "o7_kernelSetFunctions: case %d (param count %d)", args[0], num);
switch (args[0]) {
case 1:
// Used to restore images when decorating cake in