Rename as requested.

svn-id: r15530

7 files changed, 66 insertions, 66 deletions

diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 83dd71d167..e6b367a6ee 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -62,7 +62,7 @@ void Actor::initActor(int mode) {
 		frame = 0;
 		_walkbox = 0;
 		animProgress = 0;
-		skipLimbs = false;
+		heSkipLimbs = false;
 		drawToBackBuf = false;
 		memset(animVariable, 0, sizeof(animVariable));
 		memset(palette, 0, sizeof(palette));
@@ -71,7 +71,7 @@ void Actor::initActor(int mode) {
 		memset(&walkdata, 0, sizeof(ActorWalkData));
 		walkdata.point3.x = 32000;
 		walkScript = 0;
-		memset(talkQueue, 0, sizeof(talkQueue));
+		memset(heTalkQueue, 0, sizeof(heTalkQueue));
 		
 		mode = 1;
 	}
@@ -82,15 +82,15 @@ void Actor::initActor(int mode) {
 		_pos.x = 0;
 		_pos.y = 0;
 		facing = 180;
-		condMask = 1;
-		noTalkAnimation = 0;
+		heCondMask = 1;
+		heNoTalkAnimation = 0;
 		if (_vm->_version >= 7)
 			visible = false;
-		skipLimbs = false;
+		heSkipLimbs = false;
 	} else if (mode == 2) {
 		facing = 180;
-		condMask = 1;
-		skipLimbs = false;
+		heCondMask = 1;
+		heSkipLimbs = false;
 	}
 	_elevation = 0;
 	width = 24;
@@ -137,14 +137,14 @@ void Actor::initActor(int mode) {
 		_talkStopFrame = 5;
 	}
 
-	_talking = false;
+	_heTalking = false;
 	walkScript = 0;
 	talkScript = 0;
 
 	_clipOverride = _vm->_actorClipOverride;
 
 	auxBlock.visible = false;
-	paletteNum = 0;
+	hePaletteNum = 0;
 
 	_vm->_classData[number] = (_vm->_version >= 7) ? _vm->_classData[0] : 0;
 }
@@ -808,14 +808,14 @@ void Actor::showActor() {
 // an internal variable. Emulate this to prevent overwriting script vars...
 int ScummEngine::getTalkingActor() {
 	if (_gameId == GID_MANIAC && _version == 1)
-		return _V1_talkingActor;
+		return _V1TalkingActor;
 	else
 		return VAR(VAR_TALK_ACTOR);
 }
 
 void ScummEngine::setTalkingActor(int value) {
 	if (_gameId == GID_MANIAC && _version == 1)
-		_V1_talkingActor = value;
+		_V1TalkingActor = value;
 	else
 		VAR(VAR_TALK_ACTOR) = value;
 }
@@ -1079,12 +1079,12 @@ void Actor::drawActorCostume(bool hitTestMode) {
 	bcr->_draw_top = 0x7fffffff;
 	bcr->_draw_bottom = 0;
 
-	bcr->_skipLimbs = (skipLimbs != 0);
-	bcr->_paletteNum = paletteNum;
+	bcr->_skipLimbs = (heSkipLimbs != 0);
+	bcr->_paletteNum = hePaletteNum;
 	
-	if (_vm->_heversion >= 80 && noTalkAnimation == 0) {
-		condMask &= 0xFFFFFC00;
-		condMask |= 1;
+	if (_vm->_heversion >= 80 && heNoTalkAnimation == 0) {
+		heCondMask &= 0xFFFFFC00;
+		heCondMask |= 1;
 		if (_vm->getTalkingActor() == number) {
 			// Checks if talk sound is active?
 			// Otherwise just do rand animation
@@ -1092,7 +1092,7 @@ void Actor::drawActorCostume(bool hitTestMode) {
 			setTalkCondition(rnd);
 		} 
 	}
-	noTalkAnimation = 0;
+	heNoTalkAnimation = 0;
 
 	// If the actor is partially hidden, redraw it next frame.
 	// Only done for pre-AKOS, though.
@@ -1275,7 +1275,7 @@ void ScummEngine::actorTalk(const byte *msg) {
 			if ((_version <= 7 && !_keepText) || (_version == 8 && VAR(VAR_HAVE_MSG)))
 				stopTalk();
 			setTalkingActor(a->number);
-			a->_talking = true;
+			a->_heTalking = true;
 			if (!_string[0].no_talk_anim) {
 				a->runActorTalkScript(a->_talkStartFrame);
 				_useTalkAnims = true;
@@ -1338,7 +1338,7 @@ void ScummEngine::stopTalk() {
 		}
 		if (_version <= 7 && !(_features & GF_HUMONGOUS))
 			setTalkingActor(0xFF);
-		a->_talking = false;
+		a->_heTalking = false;
 	}
 	if (_version == 8 || _features & GF_HUMONGOUS)
 		setTalkingActor(0);
@@ -1352,7 +1352,7 @@ void Actor::setActorCostume(int c) {
 	int i;
 
 	if ((_vm->_features & GF_HUMONGOUS) && (c == -1  || c == -2)) {
-		skipLimbs = (c == -1);
+		heSkipLimbs = (c == -1);
 		needRedraw = true;
 		return;
 	}
@@ -1837,39 +1837,39 @@ void Actor::setUserCondition(int slot, int set) {
 	debug(1, "Actor::setUserCondition(%d, %d)", slot, set);
 	assert(slot >= 1 && slot <= 0x20);
 	if (set == 0) {
-		condMask &= ~(1 << (slot + 0xF));
+		heCondMask &= ~(1 << (slot + 0xF));
 	} else {
-		condMask |= 1 << (slot + 0xF);
+		heCondMask |= 1 << (slot + 0xF);
 	}
-	if (condMask & 0x3FF) {
-		condMask &= ~1;
+	if (heCondMask & 0x3FF) {
+		heCondMask &= ~1;
 	} else {
-		condMask |= 1;
+		heCondMask |= 1;
 	}
 }
 
 bool Actor::isUserConditionSet(int slot) const {
 	assert(slot >= 1 && slot <= 0x20);
-	return (condMask & (1 << (slot + 0xF))) != 0;
+	return (heCondMask & (1 << (slot + 0xF))) != 0;
 }
 
 void Actor::setTalkCondition(int slot) {
 	debug(1, "Actor::setTalkCondition(%d)", slot);
 	assert(slot >= 1 && slot <= 0x10);
-	condMask = (condMask & ~0x3FF) | 1;
+	heCondMask = (heCondMask & ~0x3FF) | 1;
 	if (slot != 1) {
-		condMask |= 1 << (slot - 1);
-		if (condMask & 0x3FF) {
-			condMask &= ~1;
+		heCondMask |= 1 << (slot - 1);
+		if (heCondMask & 0x3FF) {
+			heCondMask &= ~1;
 		} else {
-			condMask |= 1;
+			heCondMask |= 1;
 		}
 	}	
 }
 
 bool Actor::isTalkConditionSet(int slot) const {	
 	assert(slot >= 1 && slot <= 0x10);
-	return (condMask & (1 << (slot - 1))) != 0;
+	return (heCondMask & (1 << (slot - 1))) != 0;
 }
 
 void ScummEngine::preProcessAuxQueue() {
@@ -2017,7 +2017,7 @@ const SaveLoadEntry *Actor::getSaveLoadEntries() {
 		MKLINE(Actor, cost.soundCounter, sleByte, VER(8)),
 		MKLINE(Actor, drawToBackBuf, sleByte, VER(32)),
 		MKLINE(Actor, flip, sleByte, VER(32)),
-		MKLINE(Actor, skipLimbs, sleByte, VER(32)),
+		MKLINE(Actor, heSkipLimbs, sleByte, VER(32)),
 
 		// Actor palette grew from 64 to 256 bytes
 		MKARRAY_OLD(Actor, palette[0], sleByte, 64, VER(8), VER(9)),
@@ -2033,7 +2033,7 @@ const SaveLoadEntry *Actor::getSaveLoadEntries() {
 		MKLINE(Actor, needRedraw, sleByte, VER(8)),
 		MKLINE(Actor, needBgReset, sleByte, VER(8)),
 		MKLINE(Actor, costumeNeedsInit, sleByte, VER(8)),
-		MKLINE(Actor, condMask, sleUint32, VER(38)),
+		MKLINE(Actor, heCondMask, sleUint32, VER(38)),
 
 		MKLINE(Actor, talkPosY, sleInt16, VER(8)),
 		MKLINE(Actor, talkPosX, sleInt16, VER(8)),
diff --git a/scumm/actor.h b/scumm/actor.h
index f12e5d03d8..8cb13f42c2 100644
--- a/scumm/actor.h
+++ b/scumm/actor.h
@@ -132,11 +132,11 @@ public:
 	CostumeData cost;
 
 	/* HE specific */
-	byte paletteNum;
-	bool noTalkAnimation;
-	bool skipLimbs;
-	bool _talking;
-	uint32 condMask;
+	byte hePaletteNum;
+	bool heNoTalkAnimation;
+	bool heSkipLimbs;
+	bool _heTalking;
+	uint32 heCondMask;
 
 	AuxBlock auxBlock;
 
@@ -145,7 +145,7 @@ public:
 		int16 posY;
 		int16 color;
 		byte sentence[128];
-	} talkQueue[16];
+	} heTalkQueue[16];
 
 protected:
 	byte palette[256];
diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index 8d4bb6ec6f..9756a1622b 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -464,11 +464,11 @@ byte AkosRenderer::drawLimb(const Actor *a, int limb) {
 					uint32 type = cond & 0xC0000000;
 					cond &= 0x3FFFFFFF;
 					if (type == 0x40000000) {
-						decflag = (a->condMask & cond) ? 1 : 0;
+						decflag = (a->heCondMask & cond) ? 1 : 0;
 					} else if (type == 0x80000000) {
-						decflag = (a->condMask & cond) ? 0 : 1;
+						decflag = (a->heCondMask & cond) ? 0 : 1;
 					} else {
-						decflag = (a->condMask & cond) ? 1 : 0;
+						decflag = (a->heCondMask & cond) ? 1 : 0;
 					}
 				}
 			}
@@ -1536,13 +1536,13 @@ bool ScummEngine::akos_increaseAnim(Actor *a, int chan, const byte *aksq, const
 			akos_queCommand(8, a, GB(2), 0);
 			continue;
 		case AKC_C0A1:
-			if (a->_talking) {
+			if (a->_heTalking) {
 				curpos = GUW(2);
 				break;
 			}
 			continue;
 		case AKC_C0A2:
-			if (!a->_talking) {
+			if (!a->_heTalking) {
 				curpos = GUW(2);
 				break;
 			}
@@ -1677,12 +1677,12 @@ void ScummEngine::akos_processQueue() {
 			if (_heversion >= 71) {
 				_actorToPrintStrFor = a->number;
 
-				a->talkPosX = a->talkQueue[param_1].posX;
-				a->talkPosY = a->talkQueue[param_1].posY;
-				a->talkColor = a->talkQueue[param_1].color;
+				a->talkPosX = a->heTalkQueue[param_1].posX;
+				a->talkPosY = a->heTalkQueue[param_1].posY;
+				a->talkColor = a->heTalkQueue[param_1].color;
 
 				_string[0].loadDefault();
-				actorTalk(a->talkQueue[param_1].sentence);
+				actorTalk(a->heTalkQueue[param_1].sentence);
 
 			} else if (param_1 != 0) {
 				if (_imuseDigital) {
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index ce8b572435..e20f029030 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -473,7 +473,7 @@ void ScummEngine_v100he::o100_actorOps() {
 		a->_layer = -pop();
 		break;
 	case 63:
-		a->paletteNum = pop();
+		a->hePaletteNum = pop();
 		break;
 	case 65:		// SO_SCALE
 		i = pop();
@@ -494,11 +494,11 @@ void ScummEngine_v100he::o100_actorOps() {
 		int slot = pop();
 
 		int len = resStrLen(string) + 1;
-		addMessageToStack(string, a->talkQueue[slot].sentence, len);
+		addMessageToStack(string, a->heTalkQueue[slot].sentence, len);
 
-		a->talkQueue[slot].posX = a->talkPosX;
-		a->talkQueue[slot].posY = a->talkPosY;
-		a->talkQueue[slot].color = a->talkColor;
+		a->heTalkQueue[slot].posX = a->talkPosX;
+		a->heTalkQueue[slot].posY = a->talkPosY;
+		a->heTalkQueue[slot].color = a->talkColor;
 		}
 		break;
 	case 83:		// SO_ACTOR_VARIABLE
@@ -562,7 +562,7 @@ void ScummEngine_v100he::o100_actorOps() {
 		break;
 	case 142:
 		k = pop();
-		a->noTalkAnimation = 1;
+		a->heNoTalkAnimation = 1;
 		a->setTalkCondition(k);
 		debug(1,"o100_actorOps: case 24 (%d)", k);
 		break;
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp
index 4cda08399e..a550e12219 100644
--- a/scumm/script_v6he.cpp
+++ b/scumm/script_v6he.cpp
@@ -754,11 +754,11 @@ void ScummEngine_v60he::o60_actorOps() {
 		int slot = pop();
 
 		int len = resStrLen(string) + 1;
-		addMessageToStack(string, a->talkQueue[slot].sentence, len);
+		addMessageToStack(string, a->heTalkQueue[slot].sentence, len);
 
-		a->talkQueue[slot].posX = a->talkPosX;
-		a->talkQueue[slot].posY = a->talkPosY;
-		a->talkQueue[slot].color = a->talkColor;
+		a->heTalkQueue[slot].posX = a->talkPosX;
+		a->heTalkQueue[slot].posY = a->talkPosY;
+		a->heTalkQueue[slot].color = a->talkColor;
 		break;
 		}
 	default:
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index 1632b505a6..f78c97df7f 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -1071,7 +1071,7 @@ void ScummEngine_v72he::o72_actorOps() {
 		break;
 	case 24: // HE 80+
 		k = pop();
-		a->noTalkAnimation = 1;
+		a->heNoTalkAnimation = 1;
 		a->setTalkCondition(k);
 		debug(1,"o72_actorOps: case 24 (%d)", k);
 		break;
@@ -1193,7 +1193,7 @@ void ScummEngine_v72he::o72_actorOps() {
 		a->charset = pop();
 		break;
 	case 175:		// HE 99+
-		a->paletteNum = pop();
+		a->hePaletteNum = pop();
 		break;
 	case 198:		// SO_ACTOR_VARIABLE
 		i = pop();
@@ -1238,11 +1238,11 @@ void ScummEngine_v72he::o72_actorOps() {
 		int slot = pop();
 
 		int len = resStrLen(string) + 1;
-		addMessageToStack(string, a->talkQueue[slot].sentence, len);
+		addMessageToStack(string, a->heTalkQueue[slot].sentence, len);
 
-		a->talkQueue[slot].posX = a->talkPosX;
-		a->talkQueue[slot].posY = a->talkPosY;
-		a->talkQueue[slot].color = a->talkColor;
+		a->heTalkQueue[slot].posX = a->talkPosX;
+		a->heTalkQueue[slot].posY = a->talkPosY;
+		a->heTalkQueue[slot].color = a->talkColor;
 		break;
 		}
 	default:
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 7eb98975ef..56600da666 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -855,7 +855,7 @@ public:
 
 public:
 	/* Actor talking stuff */
-	byte _actorToPrintStrFor, _V1_talkingActor;
+	byte _actorToPrintStrFor, _V1TalkingActor;
 	int _sentenceNum;
 	SentenceTab _sentence[NUM_SENTENCE];
 	StringTab _string[6];