[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.23,1.24

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Apr 18 23:38:06 CEST 2003


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

Modified Files:
	costume.cpp 
Log Message:
ignorePakCols, should be used for ega games, why not for amiga? i don't see difference

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- costume.cpp	16 Apr 2003 07:11:04 -0000	1.23
+++ costume.cpp	19 Apr 2003 06:37:42 -0000	1.24
@@ -86,7 +86,7 @@
 	byte newAmiCost;
 	int ex1, ex2;
 	
-	newAmiCost = (_vm->_gameId == GID_MONKEY2 || _vm->_gameId == GID_INDY4) && ((_vm->_features & GF_AMIGA) || (_vm->_features & GF_16COLOR));
+	newAmiCost = (_vm->_features & GF_AMIGA) || (_vm->_features & GF_16COLOR);
 
 	CHECK_HEAP
 	_maskval = 0xF;
@@ -226,12 +226,10 @@
 		if (scaling == 0)
 			s = -_xpos;
 		if (s > 0) {
-			if (!newAmiCost) {
-				_width2 -= s;
-				ignorePakCols(s);
-				_xpos = 0;
-				_docontinue = 1;
-			}
+			_width2 -= s;
+			ignorePakCols(s);
+			_xpos = 0;
+			_docontinue = 1;
 		} else {
 			s = _right - _vm->_realWidth;
 			if (s <= 0) {
@@ -245,12 +243,10 @@
 		if (scaling == 0)
 			s = _right - _vm->_realWidth;
 		if (s > 0) {
-			if (!newAmiCost) {
-				_width2 -= s;
-				ignorePakCols(s);
-				_xpos = _vm->_realWidth - 1;
-				_docontinue = 1;
-			}
+			_width2 -= s;
+			ignorePakCols(s);
+			_xpos = _vm->_realWidth - 1;
+			_docontinue = 1;
 		} else {
 			s = -1 - _left;
 			if (s <= 0)





More information about the Scummvm-git-logs mailing list