[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.307,1.308 actor.h,1.72,1.73 akos.cpp,1.190,1.191 base-costume.h,1.29,1.30 script_v72he.cpp,2.151,2.152

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9904/scumm

Modified Files:
	actor.cpp actor.h akos.cpp base-costume.h script_v72he.cpp 
Log Message:

Add actor transparency var for HE99 games.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -d -r1.307 -r1.308
--- actor.cpp	2 Oct 2004 10:58:15 -0000	1.307
+++ actor.cpp	4 Oct 2004 06:20:09 -0000	1.308
@@ -139,6 +139,7 @@
 	_clipOverride = _vm->_actorClipOverride;
 
 	auxBlock.visible = false;
+	transparency = 0;
 
 	_vm->_classData[number] = (_vm->_version >= 7) ? _vm->_classData[0] : 0;
 }
@@ -1075,6 +1076,7 @@
 	bcr->_draw_bottom = 0;
 
 	bcr->_skipLimb = (skipLimb != 0);
+	bcr->_transparency = transparency;
 	
 	if (_vm->_heversion >= 80 && talkUnk == 0) {
 		condMask &= 0xFFFFFC00;

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- actor.h	2 Oct 2004 10:58:15 -0000	1.72
+++ actor.h	4 Oct 2004 06:20:10 -0000	1.73
@@ -134,6 +134,7 @@
 	CostumeData cost;
 	uint32 condMask;
 	bool talkUnk;
+	byte transparency;
 	AuxBlock auxBlock;
 
 	struct {

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- akos.cpp	30 Sep 2004 23:49:46 -0000	1.190
+++ akos.cpp	4 Oct 2004 06:20:10 -0000	1.191
@@ -300,10 +300,15 @@
 		palette[i] = new_palette[i] != 0xFF ? new_palette[i] : akpl[i];
 	}
 
+	if (_transparency)
+		palette[0] = _transparency;
+
 	if (_vm->_heversion == 70 && size) {
 		for (i = 0; i < size; i++)
 			palette[i] = _vm->_HEV7ActorPalette[palette[i]];
-	} else if (size == 256) {
+	}
+
+	if (size == 256) {
 		byte color = new_palette[0];
 		if (color == 255) {
 			palette[0] = color;

Index: base-costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- base-costume.h	30 Sep 2004 23:49:46 -0000	1.29
+++ base-costume.h	4 Oct 2004 06:20:10 -0000	1.30
@@ -62,6 +62,7 @@
 	byte _scaleX, _scaleY;
 
 	int _draw_top, _draw_bottom;
+	byte _transparency;
 	bool _skipLimb;
 	bool _actorDrawVirScr;
 
@@ -117,6 +118,7 @@
 		_mirror = false;
 		_width = _height = 0;
 		_skipLimb = 0;
+		_transparency = 0;
 		
 		_clipOverride.right = 0;
 		_clipOverride.left = 0;

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.151
retrieving revision 2.152
diff -u -d -r2.151 -r2.152
--- script_v72he.cpp	4 Oct 2004 04:04:36 -0000	2.151
+++ script_v72he.cpp	4 Oct 2004 06:20:10 -0000	2.152
@@ -1184,9 +1184,12 @@
 		a->talkPosY = pop();
 		a->talkPosX = pop();
 		break;
-	case 156:		// HE 7.2
+	case 156:		// HE 72+
 		a->charset = pop();
 		break;
+	case 175:		// HE 99+
+		a->transparency = pop();
+		break;
 	case 198:		// SO_ACTOR_VARIABLE
 		i = pop();
 		a->setAnimVar(pop(), i);