diff options
| author | Max Horn | 2003-05-20 20:58:26 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-20 20:58:26 +0000 |
| commit | 49e7f7564a6d33e0079898cc9584fb69c0fcdcfd (patch) | |
| tree | 6687f674e24fe1187cfce58c3d569d184316ea95 /scumm/script_v6.cpp | |
| parent | 1a394aa3c764c8a50def5bb9d8aa1342d962fbdd (diff) | |
| download | scummvm-rg350-49e7f7564a6d33e0079898cc9584fb69c0fcdcfd.tar.gz scummvm-rg350-49e7f7564a6d33e0079898cc9584fb69c0fcdcfd.tar.bz2 scummvm-rg350-49e7f7564a6d33e0079898cc9584fb69c0fcdcfd.zip | |
renamed various things for clarity
svn-id: r7754
Diffstat (limited to 'scumm/script_v6.cpp')
| -rw-r--r-- | scumm/script_v6.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index f893c836f1..1306ede6c1 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -724,7 +724,7 @@ void Scumm_v6::o6_startObjectEx() { entryp = pop(); script = pop(); flags = pop(); - runVerbCode(script, entryp, (flags & 1) != 0, (flags & 2) != 0, args); + runObjectScript(script, entryp, (flags & 1) != 0, (flags & 2) != 0, args); } void Scumm_v6::o6_startObjectQuick() { @@ -733,7 +733,7 @@ void Scumm_v6::o6_startObjectQuick() { getStackList(args, ARRAYSIZE(args)); entryp = pop(); script = pop(); - runVerbCode(script, entryp, 0, 1, args); + runObjectScript(script, entryp, 0, 1, args); } void Scumm_v6::o6_setObjectState() { @@ -765,7 +765,7 @@ void Scumm_v6::o6_endCutscene() { void Scumm_v6::o6_cutscene() { int args[16]; getStackList(args, ARRAYSIZE(args)); - cutscene(args); + beginCutscene(args); } void Scumm_v6::o6_stopMusic() { @@ -983,7 +983,7 @@ void Scumm_v6::o6_stopScript() { if (script == 0) stopObjectCode(); else - stopScriptNr(script); + stopScript(script); } void Scumm_v6::o6_walkActorToObj() { @@ -2165,7 +2165,7 @@ void Scumm_v6::o6_delayMinutes() { void Scumm_v6::o6_stopSentence() { _sentenceNum = 0; - stopScriptNr(VAR(VAR_SENTENCE_SCRIPT)); + stopScript(VAR(VAR_SENTENCE_SCRIPT)); clearClickedStatus(); } |