aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2005-05-20 06:39:18 +0000
committerTravis Howell2005-05-20 06:39:18 +0000
commit9d3ee25813b4df1615d9c264abcc16dab6c9503f (patch)
tree3f16ad45b04e449e9643a196e4a3a9cbca816a0e /scumm
parentfeca9840b85835f7e70d5fe5ca29aea90393d563 (diff)
downloadscummvm-rg350-9d3ee25813b4df1615d9c264abcc16dab6c9503f.tar.gz
scummvm-rg350-9d3ee25813b4df1615d9c264abcc16dab6c9503f.tar.bz2
scummvm-rg350-9d3ee25813b4df1615d9c264abcc16dab6c9503f.zip
Ooops
svn-id: r18188
Diffstat (limited to 'scumm')
-rw-r--r--scumm/intern.h1
-rw-r--r--scumm/script_c64.cpp6
2 files changed, 1 insertions, 6 deletions
diff --git a/scumm/intern.h b/scumm/intern.h
index ec44f94192..4f9bc35b1c 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -409,7 +409,6 @@ protected:
void o_isNotEqual();
void o_loadSound();
void o_putActorAtObject();
- void o_unfreezeScripts();
void o_unknown13();
void o_clearState08();
void o_move();
diff --git a/scumm/script_c64.cpp b/scumm/script_c64.cpp
index a40f79c7b3..63403c9d0d 100644
--- a/scumm/script_c64.cpp
+++ b/scumm/script_c64.cpp
@@ -56,7 +56,7 @@ void ScummEngine_c64::setupOpcodes() {
OPCODE(o_putActorAtObject),
OPCODE(o2_ifNotState08),
/* 10 */
- OPCODE(o_unfreezeScripts),
+ OPCODE(o5_breakHere),
OPCODE(o2_animateActor),
OPCODE(o2_panCameraTo),
OPCODE(o_unknown13),
@@ -440,10 +440,6 @@ void ScummEngine_c64::o_loadSound() {
ensureResourceLoaded(rtSound, resid);
}
-void ScummEngine_c64::o_unfreezeScripts() {
- unfreezeScripts();
-}
-
void ScummEngine_c64::o_move() {
getResultPos();
setResult(getVarOrDirectByte(PARAM_1));