[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.13,1.14

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv29988/scumm

Modified Files:
	akos.cpp 
Log Message:
Akos(16) fixes by Ludde - yay, it's working :)


Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- akos.cpp	22 Oct 2002 07:25:26 -0000	1.13
+++ akos.cpp	22 Oct 2002 09:52:14 -0000	1.14
@@ -1148,10 +1148,10 @@
 					akos16_numbits += 8;
 				}
 				bits = akos16_bits & 3;
-				if (bits != 1) {
+				if (bits & 1) {
 					akos16_bits >>= 2;
 					akos16_numbits -= 2;
-					if (bits != 2) {
+					if (bits & 2) {
 						tmp_bits = akos16_bits & 7;
 						akos16_numbits -= 3;
 						akos16_bits >>= 3;
@@ -1215,10 +1215,10 @@
 					akos16_numbits += 8;
 				}
 				bits = akos16_bits & 3;
-				if (bits != 1) {
+				if (bits & 1) {
 					akos16_bits >>= 2;
 					akos16_numbits -= 2;
-					if (bits != 2) {
+					if (bits & 2) {
 						tmp_bits = akos16_bits & 7;
 						akos16_numbits -= 3;
 						akos16_bits >>= 3;
@@ -1298,7 +1298,7 @@
 
 	if (dir < 0) {
 		dest -= (t_width - 1);
-		tmp_buf += (t_height - 1);
+		tmp_buf += (t_width - 1);
 	}
 
 	akos16SetupBitReader(src);
@@ -1375,11 +1375,7 @@
 	int32 tmp_x, tmp_y;
 
 	tmp_x = clip_left;
-	if(tmp_x < 0) {
-		tmp_x = -tmp_x;
-		clip_left -= tmp_x;
-		skip_x = tmp_x;
-	}
+	if (clip_left < 0) { skip_x = -clip_left; clip_left = 0; }
 
 	tmp_x = clip_right - maxw;
 	if(tmp_x > 0) {