[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.158,2.159 script_v6he.cpp,2.49,2.50

[Gregory Montoir]

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

Modified Files:
	intern.h script_v6he.cpp 
Log Message:
minor changes

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.158
retrieving revision 2.159
diff -u -d -r2.158 -r2.159
--- intern.h	1 Jun 2004 08:37:57 -0000	2.158
+++ intern.h	1 Jun 2004 17:56:32 -0000	2.159
@@ -544,8 +544,8 @@
 		const char *desc;
 	};
 	struct vsUnpackCtx {
-		uint8 mask;
-		uint8 num;
+		uint8 size;
+		uint8 type;
 		uint8 b;
 		uint8 *ptr;
 	};

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.49
retrieving revision 2.50
diff -u -d -r2.49 -r2.50
--- script_v6he.cpp	1 Jun 2004 08:37:57 -0000	2.49
+++ script_v6he.cpp	1 Jun 2004 17:56:33 -0000	2.50
@@ -924,30 +924,30 @@
 uint8 ScummEngine_v6he::virtScreenLoadUnpack(vsUnpackCtx *ctx, byte *data) {
 	uint8 decByte;
 	if (data != 0) {
-		ctx->num = 0;
+		ctx->type = 0;
 		ctx->ptr = data;
 		decByte = 0;
 	} else {
 		uint8 a;
-		if (ctx->num == 0) {
+		if (ctx->type == 0) {
 			a = *(ctx->ptr)++;
 			if (a & 1) {
-				ctx->num = 1;
+				ctx->type = 1;
 				ctx->b = *(ctx->ptr)++;
 			} else {
-				ctx->num = 2;
+				ctx->type = 2;
 			}
-			ctx->mask = a;
+			ctx->size = a;
 			a = (a >> 1) + 1;
 		} else {
- 			a = ctx->mask;
+ 			a = ctx->size;
 		}
-  		if (ctx->num == 2) {
+  		if (ctx->type == 2) {
   			ctx->b = *(ctx->ptr)++;
   		}
-  		ctx->mask = a - 1;
-  		if (ctx->mask == 0) {
-  			ctx->num = 0;
+  		ctx->size = a - 1;
+  		if (ctx->size == 0) {
+  			ctx->type = 0;
   		}
   		decByte = ctx->b;
 	}
@@ -1029,7 +1029,7 @@
 				if (prevByte != curByte) {
 					ibeg = iend - 1;
 				}
-				if (iend - ibeg < 3) {
+				else if (iend - ibeg < 3) {
 					if (ibeg != 0) pass = true;
 					else flag = 1;
 				}