aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v8.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-22 09:58:33 +0000
committerMax Horn2003-05-22 09:58:33 +0000
commitc78664cbc9086ed19b89b5e2810e9457ef473894 (patch)
tree862945c694f20cf405176d956e5eba94194617f9 /scumm/script_v8.cpp
parent061228688e32d2f25bb2960eebb6f8163f19631b (diff)
downloadscummvm-rg350-c78664cbc9086ed19b89b5e2810e9457ef473894.tar.gz
scummvm-rg350-c78664cbc9086ed19b89b5e2810e9457ef473894.tar.bz2
scummvm-rg350-c78664cbc9086ed19b89b5e2810e9457ef473894.zip
renamed talkFrame1/talkFrame2 to talkStartFrame/talkStopFrame
svn-id: r7819
Diffstat (limited to 'scumm/script_v8.cpp')
-rw-r--r--scumm/script_v8.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index e43c15e207..d2f816afa3 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1043,15 +1043,15 @@ void Scumm_v8::o8_actorOps() {
a->initFrame = 1;
a->walkFrame = 2;
a->standFrame = 3;
- a->talkFrame1 = 4;
- a->talkFrame2 = 5;
+ a->talkStartFrame = 4;
+ a->talkStopFrame = 5;
break;
case 0x68: // SO_ACTOR_ANIMATION_INIT Initialize animation
a->initFrame = pop();
break;
case 0x69: // SO_ACTOR_ANIMATION_TALK Set actor animation to talk animation
- a->talkFrame2 = pop();
- a->talkFrame1 = pop();
+ a->talkStopFrame = pop();
+ a->talkStartFrame = pop();
break;
case 0x6A: // SO_ACTOR_ANIMATION_WALK Set actor animation to walk animation
a->walkFrame = pop();
@@ -1611,7 +1611,7 @@ void Scumm_v8::o8_kernelGetFunctions() {
{
Actor *a = derefActorSafe(args[1], "actorTalkAnimation");
assert(a);
- push(a->talkFrame1);
+ push(a->talkStartFrame);
}
break;
case 0xDD: // getMasterSFXVol