aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2004-06-23 01:36:57 +0000
committerEugene Sandulenko2004-06-23 01:36:57 +0000
commit2e0814514c346cc3c7bf091131dce91f99473810 (patch)
tree839a79bfb88adce75c1fce320636f2dbb748b83a /scumm/script_v6.cpp
parenta350fcda0d02806a0593d556745e16226543eaa0 (diff)
downloadscummvm-rg350-2e0814514c346cc3c7bf091131dce91f99473810.tar.gz
scummvm-rg350-2e0814514c346cc3c7bf091131dce91f99473810.tar.bz2
scummvm-rg350-2e0814514c346cc3c7bf091131dce91f99473810.zip
HE 7.0 fixes
o Stub for o7_startSound o graphics decoders o findResource was moved to ScummEngine and extended o 7.0+ titles use akos costumes, so fix that in launcher o more o6_resourceRoutines stubs Now HE 7.0 games (first 320x200 windows ports) show intros and some are playable to some extent. svn-id: r14003
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r--scumm/script_v6.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index d836c28442..fea6f88b1f 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -386,7 +386,7 @@ const char *ScummEngine_v6::getOpcodeDesc(byte i) {
int ScummEngine_v6::popRoomAndObj(int *room) {
int obj;
- if (_version >= 7) {
+ if (_version >= 7 || _heversion >= 70) {
obj = pop();
*room = getObjectRoom(obj);
} else {
@@ -1461,6 +1461,7 @@ void ScummEngine_v6::o6_resourceRoutines() {
int resid, op;
op = fetchScriptByte();
+ debug(0, "resourceRoutines op: %d", op);
switch (op) {
case 100: // SO_LOAD_SCRIPT
resid = pop();
@@ -1586,7 +1587,7 @@ void ScummEngine_v6::o6_resourceRoutines() {
// QL_QueGlobForLoad(3, pop(), 1);
break;
}
- case 123:
+ case 123:
{
if (_heversion < 70)
error("o6_resourceRoutines: default case %d", op);
@@ -1597,6 +1598,16 @@ void ScummEngine_v6::o6_resourceRoutines() {
// QL_QueGlobForLoad(1, resid, 1);
break;
}
+ case 233:
+ resid = pop();
+ warning("stub o6_resourceRoutines resource %d, 1", resid);
+ // foo(resid, 1);
+ break;
+ case 235:
+ resid = pop();
+ warning("stub o6_resourceRoutines resource %d, 0", resid);
+ // foo(resid, 0);
+ break;
default:
error("o6_resourceRoutines: default case %d", op);
}