aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v5.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-20 20:58:26 +0000
committerMax Horn2003-05-20 20:58:26 +0000
commit49e7f7564a6d33e0079898cc9584fb69c0fcdcfd (patch)
tree6687f674e24fe1187cfce58c3d569d184316ea95 /scumm/script_v5.cpp
parent1a394aa3c764c8a50def5bb9d8aa1342d962fbdd (diff)
downloadscummvm-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_v5.cpp')
-rw-r--r--scumm/script_v5.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index a02c71758f..59c77b23f3 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -688,7 +688,7 @@ void Scumm_v5::o5_cursorCommand() {
void Scumm_v5::o5_cutscene() {
int args[16];
getWordVararg(args);
- cutscene(args);
+ beginCutscene(args);
}
void Scumm_v5::o5_endCutscene() {
@@ -738,7 +738,7 @@ void Scumm_v5::o5_doSentence() {
a = getVarOrDirectByte(0x80);
if (a == 0xFE) {
_sentenceNum = 0;
- stopScriptNr(VAR(VAR_SENTENCE_SCRIPT));
+ stopScript(VAR(VAR_SENTENCE_SCRIPT));
clearClickedStatus();
return;
}
@@ -2057,7 +2057,7 @@ void Scumm_v5::o5_startObject() {
script = getVarOrDirectByte(0x40);
getWordVararg(data);
- runVerbCode(obj, script, 0, 0, data);
+ runObjectScript(obj, script, 0, 0, data);
}
void Scumm_v5::o5_startScript() {
@@ -2094,7 +2094,7 @@ void Scumm_v5::o5_stopScript() {
if (!script)
stopObjectCode();
else
- stopScriptNr(script);
+ stopScript(script);
}
void Scumm_v5::o5_stringOps() {