aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/he
diff options
context:
space:
mode:
authorTravis Howell2006-02-26 00:32:10 +0000
committerTravis Howell2006-02-26 00:32:10 +0000
commit76962c3ce68dc04791cb85ef3c9544c95fd00fc6 (patch)
tree91805300f2d230da734869f62bac5d0359e1535a /engines/scumm/he
parent0cb17f18b3c23653e693f20b6e591accf29ac76c (diff)
downloadscummvm-rg350-76962c3ce68dc04791cb85ef3c9544c95fd00fc6.tar.gz
scummvm-rg350-76962c3ce68dc04791cb85ef3c9544c95fd00fc6.tar.bz2
scummvm-rg350-76962c3ce68dc04791cb85ef3c9544c95fd00fc6.zip
Change debugInput opcode result to zerod array for now, since it expects input string
svn-id: r20901
Diffstat (limited to 'engines/scumm/he')
-rw-r--r--engines/scumm/he/script_v72he.cpp7
-rw-r--r--engines/scumm/he/wiz_he.cpp4
2 files changed, 5 insertions, 6 deletions
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index 1fc23dea9b..0ca304f04a 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -1718,13 +1718,12 @@ void ScummEngine_v72he::o72_debugInput() {
byte string[255];
copyScriptString(string, sizeof(string));
- int len = resStrLen(string) + 1;
+ debug(0,"o72_debugInput: String %s", string);
+ // TODO: Request input and store string result in array
writeVar(0, 0);
- ArrayHeader *ah = defineArray(0, kStringArray, 0, 0, 0, len);
- memcpy(ah->data, string, len);
+ defineArray(0, kStringArray, 0, 0, 0, 0);
push(readVar(0));
- debug(1,"o72_debugInput: String %s", string);
}
void ScummEngine_v72he::o72_jumpToScript() {
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index befda8f5c6..6fa605b7cb 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -548,8 +548,8 @@ void Wiz::copyRawWizImage(uint8 *dst, const uint8 *src, int dstw, int dsth, int
}
palPtr = imagePal;
}
- int h = r1.height();
- int w = r1.width();
+ int h = r1.height() + 1;
+ int w = r1.width() + 1;
src += r1.left + r1.top * srcw;
dst += r2.left + r2.top * dstw;
while (h--) {