aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2004-10-02 22:26:34 +0000
committerMax Horn2004-10-02 22:26:34 +0000
commite72ccd620be6e5648094ad7acc8011c228bfc235 (patch)
treeacb2bf1271681a370e105288249b52be64e54c2e /scumm
parent37aa90052cc9d821de0fedec300889857588253e (diff)
downloadscummvm-rg350-e72ccd620be6e5648094ad7acc8011c228bfc235.tar.gz
scummvm-rg350-e72ccd620be6e5648094ad7acc8011c228bfc235.tar.bz2
scummvm-rg350-e72ccd620be6e5648094ad7acc8011c228bfc235.zip
One more...
svn-id: r15384
Diffstat (limited to 'scumm')
-rw-r--r--scumm/intern.h1
-rw-r--r--scumm/script_v6he.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/scumm/intern.h b/scumm/intern.h
index 78016c9b6f..cedb918bb1 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -573,7 +573,6 @@ protected:
int readFileToArray(int slot, int32 size);
void writeFileFromArray(int slot, int resID);
int virtScreenSave(byte *dst, int x1, int y1, int x2, int y2);
- int virtScreenSavePack(byte *dst, byte *src, int len, int unk);
void virtScreenLoad(int resIdx, int x1, int y1, int x2, int y2);
void seekFilePos(int slot, int offset, int mode);
virtual void decodeParseString(int a, int b);
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp
index 7f93989cf3..ae3cd29be3 100644
--- a/scumm/script_v6he.cpp
+++ b/scumm/script_v6he.cpp
@@ -55,6 +55,7 @@ struct vsPackCtx {
static void virtScreenSavePackBuf(vsPackCtx *ctx, uint8 *&dst, int len);
static void virtScreenSavePackByte(vsPackCtx *ctx, uint8 *&dst, int len, uint8 b);
static uint8 virtScreenLoadUnpack(vsUnpackCtx *ctx, byte *data);
+static int virtScreenSavePack(byte *dst, byte *src, int len, int unk);
// Compatibility notes:
//
@@ -881,6 +882,7 @@ uint8 virtScreenLoadUnpack(vsUnpackCtx *ctx, byte *data) {
return decByte;
}
+
void ScummEngine_v60he::o60_kernelGetFunctions() {
int args[29];
int retval;
@@ -919,7 +921,7 @@ int ScummEngine_v60he::virtScreenSave(byte *dst, int x1, int y1, int x2, int y2)
return packedSize;
}
-int ScummEngine_v60he::virtScreenSavePack(byte *dst, byte *src, int len, int unk) {
+int virtScreenSavePack(byte *dst, byte *src, int len, int unk) {
vsPackCtx ctx;
memset(&ctx, 0, sizeof(ctx));