[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.89,1.90

Travis Howell kirben at users.sourceforge.net
Sun Aug 10 20:46:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv4085/scumm

Modified Files:
	costume.cpp 
Log Message:

Fix a regression, this code is required for Amiga versions!
Fixes some brief costume distortions


Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- costume.cpp	24 Jul 2003 17:44:00 -0000	1.89
+++ costume.cpp	11 Aug 2003 03:45:12 -0000	1.90
@@ -205,13 +205,15 @@
 		if (!use_scaling)
 			skip = -v1.x;
 		if (skip > 0) {
-			v1.skip_width -= skip;
+			if (!(_vm->_features & GF_AMIGA)) {
+				v1.skip_width -= skip;
 
-			if (_loaded._format == 0x57)
-				c64_ignorePakCols(skip);
-			else
-				codec1_ignorePakCols(skip);
-			v1.x = 0;
+				if (_loaded._format == 0x57)
+					c64_ignorePakCols(skip);
+				else
+					codec1_ignorePakCols(skip);
+				v1.x = 0;
+			}
 		} else {
 			skip = x_right - _vm->_screenWidth;
 			if (skip <= 0) {
@@ -224,13 +226,15 @@
 		if (!use_scaling)
 			skip = x_right - _vm->_screenWidth;
 		if (skip > 0) {
-			v1.skip_width -= skip;
+			if (!(_vm->_features & GF_AMIGA)) {
+				v1.skip_width -= skip;
 
-			if (_loaded._format == 0x57)
-				c64_ignorePakCols(skip);
-			else
-				codec1_ignorePakCols(skip);
-			v1.x = _vm->_screenWidth - 1;
+				if (_loaded._format == 0x57)
+					c64_ignorePakCols(skip);
+				else
+					codec1_ignorePakCols(skip);
+				v1.x = _vm->_screenWidth - 1;
+			}
 		} else {
 			skip = -1 - x_left;
 			if (skip <= 0)





More information about the Scummvm-git-logs mailing list