[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.106,1.107 actor.h,1.24,1.25 saveload.cpp,1.73,1.74 script_v5.cpp,1.93,1.94 script_v6.cpp,1.123,1.124 script_v8.cpp,2.164,2.165 sound.cpp,1.119,1.120 string.cpp,1.115,1.116
Max Horn
fingolfin at users.sourceforge.net
Thu May 22 02:59:06 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv1443
Modified Files:
actor.cpp actor.h saveload.cpp script_v5.cpp script_v6.cpp
script_v8.cpp sound.cpp string.cpp
Log Message:
renamed talkFrame1/talkFrame2 to talkStartFrame/talkStopFrame
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- actor.cpp 22 May 2003 09:52:21 -0000 1.106
+++ actor.cpp 22 May 2003 09:58:32 -0000 1.107
@@ -82,14 +82,14 @@
initFrame = 2;
walkFrame = 0;
standFrame = 1;
- talkFrame1 = 5;
- talkFrame2 = 4;
+ talkStartFrame = 5;
+ talkStopFrame = 4;
} else {
initFrame = 1;
walkFrame = 2;
standFrame = 3;
- talkFrame1 = 4;
- talkFrame2 = 5;
+ talkStartFrame = 4;
+ talkStopFrame = 5;
}
walk_script = 0;
@@ -439,10 +439,10 @@
f = standFrame;
break;
case 1004:
- f = talkFrame1;
+ f = talkStartFrame;
break;
case 1005:
- f = talkFrame2;
+ f = talkStopFrame;
break;
}
@@ -469,10 +469,10 @@
f = standFrame;
break;
case 0x3B:
- f = talkFrame1;
+ f = talkStartFrame;
break;
case 0x3C:
- f = talkFrame2;
+ f = talkStopFrame;
break;
}
@@ -756,7 +756,7 @@
startAnimActor(initFrame);
if (_vm->_features & GF_AFTER_V2) {
startAnimActor(standFrame);
- startAnimActor(talkFrame2);
+ startAnimActor(talkStopFrame);
}
costumeNeedsInit = false;
}
@@ -1094,7 +1094,7 @@
stopTalk();
VAR(VAR_TALK_ACTOR) = a->number;
if (!_string[0].no_talk_anim) {
- a->startAnimActor(a->talkFrame1);
+ a->startAnimActor(a->talkStartFrame);
_useTalkAnims = true;
}
oldact = VAR(VAR_TALK_ACTOR);
@@ -1130,7 +1130,7 @@
if (act && act < 0x80) {
Actor *a = derefActorSafe(act, "stopTalk");
if ((a->isInCurrentRoom() && _useTalkAnims) || (_features & GF_NEW_COSTUMES)) {
- a->startAnimActor(a->talkFrame2);
+ a->startAnimActor(a->talkStopFrame);
_useTalkAnims = false;
}
VAR(VAR_TALK_ACTOR) = 0xFF;
Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- actor.h 22 May 2003 00:51:42 -0000 1.24
+++ actor.h 22 May 2003 09:58:32 -0000 1.25
@@ -90,7 +90,7 @@
byte moving;
bool ignoreBoxes;
byte forceClip;
- byte initFrame, walkFrame, standFrame, talkFrame1, talkFrame2;
+ byte initFrame, walkFrame, standFrame, talkStartFrame, talkStopFrame;
bool needRedraw, needBgReset, costumeNeedsInit, visible;
byte shadow_mode;
bool flip;
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- saveload.cpp 22 May 2003 05:21:48 -0000 1.73
+++ saveload.cpp 22 May 2003 09:58:32 -0000 1.74
@@ -296,8 +296,8 @@
MKLINE(Actor, initFrame, sleByte, VER_V8),
MKLINE(Actor, walkFrame, sleByte, VER_V8),
MKLINE(Actor, standFrame, sleByte, VER_V8),
- MKLINE(Actor, talkFrame1, sleByte, VER_V8),
- MKLINE(Actor, talkFrame2, sleByte, VER_V8),
+ MKLINE(Actor, talkStartFrame, sleByte, VER_V8),
+ MKLINE(Actor, talkStopFrame, sleByte, VER_V8),
MKLINE(Actor, speedx, sleUint16, VER_V8),
MKLINE(Actor, speedy, sleUint16, VER_V8),
MKLINE(Actor, cost.animCounter1, sleUint16, VER_V8),
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- script_v5.cpp 21 May 2003 18:09:46 -0000 1.93
+++ script_v5.cpp 22 May 2003 09:58:32 -0000 1.94
@@ -434,8 +434,8 @@
a->walkFrame = getVarOrDirectByte(0x80);
break;
case 5: /* talkanim */
- a->talkFrame1 = getVarOrDirectByte(0x80);
- a->talkFrame2 = getVarOrDirectByte(0x40);
+ a->talkStartFrame = getVarOrDirectByte(0x80);
+ a->talkStopFrame = getVarOrDirectByte(0x40);
break;
case 6: /* standanim */
a->standFrame = getVarOrDirectByte(0x80);
@@ -457,8 +457,8 @@
a->initFrame = 1;
a->walkFrame = 2;
a->standFrame = 3;
- a->talkFrame1 = 4;
- a->talkFrame2 = 5;
+ a->talkStartFrame = 4;
+ a->talkStopFrame = 5;
break;
case 11: /* palette */
i = getVarOrDirectByte(0x80);
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- script_v6.cpp 21 May 2003 18:09:47 -0000 1.123
+++ script_v6.cpp 22 May 2003 09:58:32 -0000 1.124
@@ -1626,8 +1626,8 @@
a->walkFrame = pop();
break;
case 80: /* actor-talkframe */
- a->talkFrame2 = pop();
- a->talkFrame1 = pop();
+ a->talkStopFrame = pop();
+ a->talkStartFrame = pop();
break;
case 81: /* actor-standframe */
a->standFrame = pop();
@@ -1650,8 +1650,8 @@
a->initFrame = 1;
a->walkFrame = 2;
a->standFrame = 3;
- a->talkFrame1 = 4;
- a->talkFrame2 = 5;
+ a->talkStartFrame = 4;
+ a->talkStopFrame = 5;
break;
case 86: /* actor-palette */
j = pop();
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.164
retrieving revision 2.165
diff -u -d -r2.164 -r2.165
--- script_v8.cpp 21 May 2003 18:09:47 -0000 2.164
+++ script_v8.cpp 22 May 2003 09:58:33 -0000 2.165
@@ -1043,15 +1043,15 @@
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 @@
{
Actor *a = derefActorSafe(args[1], "actorTalkAnimation");
assert(a);
- push(a->talkFrame1);
+ push(a->talkStartFrame);
}
break;
case 0xDD: // getMasterSFXVol
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- sound.cpp 21 May 2003 18:09:48 -0000 1.119
+++ sound.cpp 22 May 2003 09:58:33 -0000 1.120
@@ -500,7 +500,7 @@
a->startAnimActor(_talk_sound_frame);
_talk_sound_frame = -1;
} else
- a->startAnimActor(b ? a->talkFrame2 : a->talkFrame1);
+ a->startAnimActor(b ? a->talkStopFrame : a->talkStartFrame);
}
}
}
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- string.cpp 21 May 2003 18:09:48 -0000 1.115
+++ string.cpp 22 May 2003 09:58:33 -0000 1.116
@@ -327,7 +327,7 @@
if (has_talk_sound)
_sound->talkSound(talk_sound_a, talk_sound_b, 2, frme);
if (a && has_anim)
- a->startAnimActor(frme != -1 ? frme : a->talkFrame1);
+ a->startAnimActor(frme != -1 ? frme : a->talkStartFrame);
_charsetBufPos = buffer - _charsetBuffer;
More information about the Scummvm-git-logs
mailing list