diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/scumm_v2.h | 2 | ||||
| -rw-r--r-- | engines/scumm/verbs.cpp | 13 |
2 files changed, 0 insertions, 15 deletions
diff --git a/engines/scumm/scumm_v2.h b/engines/scumm/scumm_v2.h index be623924f1..0c54308181 100644 --- a/engines/scumm/scumm_v2.h +++ b/engines/scumm/scumm_v2.h @@ -103,8 +103,6 @@ protected: virtual void setBuiltinCursor(int index); - virtual void runObject(int obj, int entry); - /* Version 2 script opcodes */ void o2_actorFromPos(); void o2_actorOps(); diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp index 3d16dc566c..25a59e0317 100644 --- a/engines/scumm/verbs.cpp +++ b/engines/scumm/verbs.cpp @@ -756,19 +756,6 @@ void ScummEngine_v0::runObject(int obj, int entry) { } } -void ScummEngine_v2::runObject(int obj, int entry) { - if (getVerbEntrypoint(obj, entry) != 0) { - runObjectScript(obj, entry, false, false, NULL); - } else if (entry != 13 && entry != 15) { - VAR(9) = entry; - runScript(3, 0, 0, 0); - } - - _activeInventory = 0; - _activeObject = 0; - _activeVerb = 13; -} - bool ScummEngine_v0::verbMoveToActor(int actor) { Actor *a = derefActor(VAR(VAR_EGO), "verbMoveToActor"); Actor *a2 = derefActor(actor, "verbMoveToActor"); |