[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.311,1.312 actor.h,1.73,1.74 akos.cpp,1.196,1.197 base-costume.h,1.31,1.32 script_v100he.cpp,2.12,2.13 script_v72he.cpp,2.168,2.169

[Travis Howell]

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

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

Rename var
Update HE issues


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -d -r1.311 -r1.312
--- actor.cpp	11 Oct 2004 22:27:25 -0000	1.311
+++ actor.cpp	12 Oct 2004 04:26:02 -0000	1.312
@@ -144,7 +144,7 @@
 	_clipOverride = _vm->_actorClipOverride;
 
 	auxBlock.visible = false;
-	transparency = 0;
+	paletteNum = 0;
 
 	_vm->_classData[number] = (_vm->_version >= 7) ? _vm->_classData[0] : 0;
 }
@@ -1080,7 +1080,7 @@
 	bcr->_draw_bottom = 0;
 
 	bcr->_skipLimb = (skipLimb != 0);
-	bcr->_transparency = transparency;
+	bcr->_paletteNum = paletteNum;
 	
 	if (_vm->_heversion >= 80 && talkUnk == 0) {
 		condMask &= 0xFFFFFC00;

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- actor.h	4 Oct 2004 06:20:10 -0000	1.73
+++ actor.h	12 Oct 2004 04:26:02 -0000	1.74
@@ -134,7 +134,7 @@
 	CostumeData cost;
 	uint32 condMask;
 	bool talkUnk;
-	byte transparency;
+	byte paletteNum;
 	AuxBlock auxBlock;
 
 	struct {

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- akos.cpp	9 Oct 2004 00:06:36 -0000	1.196
+++ akos.cpp	12 Oct 2004 04:26:02 -0000	1.197
@@ -300,8 +300,10 @@
 		palette[i] = new_palette[i] != 0xFF ? new_palette[i] : akpl[i];
 	}
 
-	if (_transparency)
-		palette[0] = _transparency;
+	if (_paletteNum) {
+		// TODO
+		// Sets palette number to use for actor palette
+	}
 
 	if (_vm->_heversion == 70 && size) {
 		for (i = 0; i < size; i++)

Index: base-costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- base-costume.h	9 Oct 2004 00:06:36 -0000	1.31
+++ base-costume.h	12 Oct 2004 04:26:02 -0000	1.32
@@ -62,7 +62,7 @@
 	byte _scaleX, _scaleY;
 
 	int _draw_top, _draw_bottom;
-	byte _transparency;
+	byte _paletteNum;
 	bool _skipLimb;
 	bool _actorDrawVirScr;
 
@@ -117,7 +117,7 @@
 		_mirror = false;
 		_width = _height = 0;
 		_skipLimb = 0;
-		_transparency = 0;
+		_paletteNum = 0;
 	}
 
 	virtual void setPalette(byte *palette) = 0;

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.12
retrieving revision 2.13
diff -u -d -r2.12 -r2.13
--- script_v100he.cpp	10 Oct 2004 05:49:30 -0000	2.12
+++ script_v100he.cpp	12 Oct 2004 04:26:02 -0000	2.13
@@ -473,7 +473,7 @@
 		a->_layer = -pop();
 		break;
 	case 63:
-		a->transparency = pop();
+		a->paletteNum = pop();
 		break;
 	case 65:		// SO_SCALE
 		i = pop();

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.168
retrieving revision 2.169
diff -u -d -r2.168 -r2.169
--- script_v72he.cpp	11 Oct 2004 02:05:37 -0000	2.168
+++ script_v72he.cpp	12 Oct 2004 04:26:02 -0000	2.169
@@ -1193,7 +1193,7 @@
 		a->charset = pop();
 		break;
 	case 175:		// HE 99+
-		a->transparency = pop();
+		a->paletteNum = pop();
 		break;
 	case 198:		// SO_ACTOR_VARIABLE
 		i = pop();