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_v2.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_v2.cpp')
| -rw-r--r-- | scumm/script_v2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index fae2680235..5d803e16ab 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -828,7 +828,7 @@ void Scumm_v2::o2_doSentence() { a = getVarOrDirectByte(0x80); if (a == 0xFB) { _sentenceNum = 0; - stopScriptNr(SENTENCE_SCRIPT); + stopScript(SENTENCE_SCRIPT); return; } if (a == 0xFC) { @@ -855,7 +855,7 @@ void Scumm_v2::o2_doSentence() { _scummVars[VAR_ACTIVE_VERB] = st->verb; _scummVars[VAR_ACTIVE_OBJECT1] = st->objectA; _scummVars[VAR_ACTIVE_OBJECT2] = st->objectB; - runVerbCode(st->objectA, st->verb, 0, 0, NULL); + runObjectScript(st->objectA, st->verb, 0, 0, NULL); break; case 2: @@ -1134,7 +1134,7 @@ void Scumm_v2::o2_roomOps() { void Scumm_v2::o2_cutscene() { warning("TODO o2_cutscene()"); _sentenceNum = 0; - stopScriptNr(SENTENCE_SCRIPT); + stopScript(SENTENCE_SCRIPT); resetSentence(); } |