Rename vars

Add some missng code for HE games.

svn-id: r15528

scumm/actor.cpp

@@ -62,7 +62,7 @@ void Actor::initActor(int mode) {
 		frame = 0;
 		_walkbox = 0;
 		animProgress = 0;
-		skipLimb = false;
+		skipLimbs = false;
 		drawToBackBuf = false;
 		memset(animVariable, 0, sizeof(animVariable));
 		memset(palette, 0, sizeof(palette));
@@ -83,14 +83,14 @@ void Actor::initActor(int mode) {
 		_pos.y = 0;
 		facing = 180;
 		condMask = 1;
-		talkUnk = 0;
+		noTalkAnimation = 0;
 		if (_vm->_version >= 7)
 			visible = false;
-		skipLimb = false;
+		skipLimbs = false;
 	} else if (mode == 2) {
 		facing = 180;
 		condMask = 1;
-		skipLimb = false;
+		skipLimbs = false;
 	}
 	_elevation = 0;
 	width = 24;
@@ -1079,10 +1079,10 @@ void Actor::drawActorCostume(bool hitTestMode) {
 	bcr->_draw_top = 0x7fffffff;
 	bcr->_draw_bottom = 0;
 
-	bcr->_skipLimb = (skipLimb != 0);
+	bcr->_skipLimbs = (skipLimbs != 0);
 	bcr->_paletteNum = paletteNum;
 	
-	if (_vm->_heversion >= 80 && talkUnk == 0) {
+	if (_vm->_heversion >= 80 && noTalkAnimation == 0) {
 		condMask &= 0xFFFFFC00;
 		condMask |= 1;
 		if (_vm->getTalkingActor() == number) {
@@ -1092,7 +1092,7 @@ void Actor::drawActorCostume(bool hitTestMode) {
 			setTalkCondition(rnd);
 		} 
 	}
-	talkUnk = 0;
+	noTalkAnimation = 0;
 
 	// If the actor is partially hidden, redraw it next frame.
 	// Only done for pre-AKOS, though.
@@ -1352,7 +1352,7 @@ void Actor::setActorCostume(int c) {
 	int i;
 
 	if ((_vm->_features & GF_HUMONGOUS) && (c == -1  || c == -2)) {
-		skipLimb = (c == -1);
+		skipLimbs = (c == -1);
 		needRedraw = true;
 		return;
 	}
@@ -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, skipLimb, sleByte, VER(32)),
+		MKLINE(Actor, skipLimbs, sleByte, VER(32)),
 
 		// Actor palette grew from 64 to 256 bytes
 		MKARRAY_OLD(Actor, palette[0], sleByte, 64, VER(8), VER(9)),

scumm/actor.h

@@ -126,15 +126,18 @@ public:
 	int16 talkPosX, talkPosY;
 	uint16 talkScript, walkScript;
 	bool ignoreTurns;
-	bool skipLimb;
 	bool drawToBackBuf;
-	bool _talking;
 	int8 _layer;
 	uint16 sound[32];
 	CostumeData cost;
-	uint32 condMask;
-	bool talkUnk;
+
+	/* HE specific */
 	byte paletteNum;
+	bool noTalkAnimation;
+	bool skipLimbs;
+	bool _talking;
+	uint32 condMask;
+
 	AuxBlock auxBlock;
 
 	struct {

scumm/akos.cpp

@@ -358,7 +358,7 @@ byte AkosRenderer::drawLimb(const Actor *a, int limb) {
 		seq3Idx[i] = i;
 	}
 
-	if (_skipLimb)
+	if (_skipLimbs)
 		return 0;
 
 	if (_vm->_heversion >= 70 && cost.active[limb] == 8)

scumm/base-costume.h

@@ -63,7 +63,7 @@ public:
 
 	int _draw_top, _draw_bottom;
 	byte _paletteNum;
-	bool _skipLimb;
+	bool _skipLimbs;
 	bool _actorDrawVirScr;
 
 
@@ -116,7 +116,7 @@ public:
 		_xmove = _ymove = 0;
 		_mirror = false;
 		_width = _height = 0;
-		_skipLimb = 0;
+		_skipLimbs = 0;
 		_paletteNum = 0;
 	}
 

scumm/script_v100he.cpp

@@ -562,7 +562,7 @@ void ScummEngine_v100he::o100_actorOps() {
 		break;
 	case 142:
 		k = pop();
-		a->talkUnk = 1;
+		a->noTalkAnimation = 1;
 		a->setTalkCondition(k);
 		debug(1,"o100_actorOps: case 24 (%d)", k);
 		break;

scumm/script_v72he.cpp

@@ -1071,7 +1071,7 @@ void ScummEngine_v72he::o72_actorOps() {
 		break;
 	case 24: // HE 80+
 		k = pop();
-		a->talkUnk = 1;
+		a->noTalkAnimation = 1;
 		a->setTalkCondition(k);
 		debug(1,"o72_actorOps: case 24 (%d)", k);
 		break;

scumm/script_v80he.cpp

@@ -636,30 +636,60 @@ void ScummEngine_v80he::o80_drawWizPolygon() {
 
 void ScummEngine_v80he::o80_unknownE0() {
 	// wizImage related
-	int a, b, c, d, e, f, type = 1;
+	int b, c, d, num, x1, y1, type = 0;
 
-	a = pop();
 	b = pop();
+	num = pop();
 	c = pop();
 	d = pop();
-	e = pop();
-	f = pop();
+	y1 = pop();
+	x1 = pop();
 
 	byte subOp = fetchScriptByte();
 
 	switch (subOp) {
 	case 55:
+		{
+		Actor *a = derefActorSafe(num, "o80_unknownE0");
+		int top_actor = a->top;
+		int bottom_actor = a->bottom;
+		a->drawToBackBuf = true;
+		a->needRedraw = true;
+		a->drawActorCostume();
+		a->drawToBackBuf = false;
+		a->needRedraw = true;
+		a->drawActorCostume();
+		a->needRedraw = false;
+
+		if (a->top > top_actor)
+			a->top = top_actor;
+		if (a->bottom < bottom_actor)
+			a->bottom = bottom_actor;
+
 		type = 2;
+		}
 		break;
 	case 63:
+		{
+		WizImage wi;
+		wi.flags = 0;
+		wi.y1 = y1;
+		wi.x1 = x1;
+		wi.resNum = num;
+		wi.state = 0;
+		displayWizImage(&wi);
+
 		type = 3;
+		}
 		break;
 	case 66:
 		type = 1;
 		break;
+	default:
+		error("o80_unknownE0: default case %d", subOp);
 	}
 
-	debug(1,"o80_unknownE0 stub: type %d (%d, %d, %d, %d, %d, %d)",subOp, a, b, c, d, e, f);	
+	debug(1,"o80_unknownE0 stub: type %d (%d, num %d, %d, %d, y %d, x %d)", type, b, num, c, d, y1, x1);	
 }
 
 void ScummEngine_v80he::o80_pickVarRandom() {