aboutsummaryrefslogtreecommitdiff
path: root/scummvm.cpp
diff options
context:
space:
mode:
authorJames Brown2002-04-07 04:29:15 +0000
committerJames Brown2002-04-07 04:29:15 +0000
commitd2d498d08c2848051feb85b12ff6460d5c7c5d84 (patch)
tree9354ed594bec11738bae4d439c33184906071712 /scummvm.cpp
parent6f2da5c673017132248ccd2f1604bf8868605226 (diff)
downloadscummvm-rg350-d2d498d08c2848051feb85b12ff6460d5c7c5d84.tar.gz
scummvm-rg350-d2d498d08c2848051feb85b12ff6460d5c7c5d84.tar.bz2
scummvm-rg350-d2d498d08c2848051feb85b12ff6460d5c7c5d84.zip
Fix Indy4 bootparam, some more Zak256 work, and a few minor things.
svn-id: r3887
Diffstat (limited to 'scummvm.cpp')
-rw-r--r--scummvm.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/scummvm.cpp b/scummvm.cpp
index c7fe040dc5..1ffe921e99 100644
--- a/scummvm.cpp
+++ b/scummvm.cpp
@@ -863,7 +863,7 @@ void Scumm::convertKeysToClicks() {
Actor *Scumm::derefActorSafe(int id, const char *errmsg) {
if (id<1 || id>=NUM_ACTORS) {
- warning("Invalid actor %d in %s (script %d) - This is potentially a BIG problem.", id, errmsg, vm.slot[_curExecScript].number);
+ warning("Invalid actor %d in %s (script %d, opcode 0x%x) - This is potentially a BIG problem.", id, errmsg, vm.slot[_curExecScript].number, _opcode);
return NULL;
}
return derefActor(id);
@@ -1064,6 +1064,10 @@ void Scumm::launch()
// if (_gameId==GID_MONKEY2 && _bootParam == 0)
// _bootParam = 10001;
+
+ if (_gameId==GID_INDY4 && _bootParam==0) {
+ _bootParam = -7873;
+ }
readIndexFile();