more costume/akos changes

svn-id: r8074

1 files changed, 7 insertions, 3 deletions

diff --git a/scumm/base-costume.h b/scumm/base-costume.h
index fcd638abab..23cd56d9b0 100644
--- a/scumm/base-costume.h
+++ b/scumm/base-costume.h
@@ -57,7 +57,7 @@ public:
 
 	int _draw_top, _draw_bottom;
 
-	// Destination params
+	// Destination
 	byte *_outptr;
 	uint _outwidth, _outheight;
 
@@ -65,6 +65,9 @@ protected:
 	Scumm *_vm;
 	int32 _numStrips;
 
+	// Source pointer
+	const byte *_srcptr;
+
 	// current move offset
 	int _xmove, _ymove;
 
@@ -75,14 +78,14 @@ protected:
 	int _width, _height;
 
 	struct {
-		/* codec stuff */
+		// Parameters for the original ("V1") costume codec.
 		const byte *scaletable;
 		byte mask, shr;
 		byte repcolor;
 		byte replen;
 		int scaleXstep;
 		int x, y;
-		int tmp_x, tmp_y;
+		int scaleXindex, scaleYindex;
 		int skip_width;
 		byte *destptr;
 		const byte *mask_ptr;
@@ -101,6 +104,7 @@ public:
 		
 		_vm = scumm;
 		_numStrips = _vm->gdi._numStrips;
+		_srcptr = 0;
 		_xmove = _ymove = 0;
 		_mirror = false;
 		_width = _height = 0;