renamed talkFrame1/talkFrame2 to talkStartFrame/talkStopFrame

svn-id: r7819

8 files changed, 29 insertions, 29 deletions

diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 54ec3e8a76..0508c6679a 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -82,14 +82,14 @@ void Actor::initActor(int mode) {
 		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 @@ void Actor::startAnimActor(int f) {
 			f = standFrame;
 			break;
 		case 1004:
-			f = talkFrame1;
+			f = talkStartFrame;
 			break;
 		case 1005:
-			f = talkFrame2;
+			f = talkStopFrame;
 			break;
 		}
 
@@ -469,10 +469,10 @@ void Actor::startAnimActor(int f) {
 			f = standFrame;
 			break;
 		case 0x3B:
-			f = talkFrame1;
+			f = talkStartFrame;
 			break;
 		case 0x3C:
-			f = talkFrame2;
+			f = talkStopFrame;
 			break;
 		}
 		
@@ -756,7 +756,7 @@ void Actor::showActor() {
 		startAnimActor(initFrame);
 		if (_vm->_features & GF_AFTER_V2) {
 			startAnimActor(standFrame);
-			startAnimActor(talkFrame2);
+			startAnimActor(talkStopFrame);
 		}
 		costumeNeedsInit = false;
 	}
@@ -1094,7 +1094,7 @@ void Scumm::actorTalk() {
 				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 @@ void Scumm::stopTalk() {
 	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;
diff --git a/scumm/actor.h b/scumm/actor.h
index 7cf3d80af8..123bb1f557 100644
--- a/scumm/actor.h
+++ b/scumm/actor.h
@@ -90,7 +90,7 @@ public:
 	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;
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index ddaf33b244..deaa01bbfe 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -296,8 +296,8 @@ void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion) {
 		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),
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index c2381534dd..7d0377d566 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -434,8 +434,8 @@ void Scumm_v5::o5_actorSet() {
 			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 @@ void Scumm_v5::o5_actorSet() {
 			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);
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 8ac3b69b5a..fbe380ff5c 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1626,8 +1626,8 @@ void Scumm_v6::o6_actorOps() {
 		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 @@ void Scumm_v6::o6_actorOps() {
 		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();
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
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index f87ffec927..8520e31c83 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -500,7 +500,7 @@ void Sound::processSfxQueues() {
 						a->startAnimActor(_talk_sound_frame);
 						_talk_sound_frame = -1;
 					} else
-						a->startAnimActor(b ? a->talkFrame2 : a->talkFrame1);
+						a->startAnimActor(b ? a->talkStopFrame : a->talkStartFrame);
 				}
 			}
 		}
diff --git a/scumm/string.cpp b/scumm/string.cpp
index ffce2e0097..e802259786 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -327,7 +327,7 @@ void Scumm::CHARSET_1() {
 	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;