[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.91,1.92

Travis Howell kirben at users.sourceforge.net
Sun Aug 10 23:25:03 CEST 2003


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

Modified Files:
	costume.cpp 
Log Message:

Ooops that should only be for Amiga scumm 5 games.


Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- costume.cpp	11 Aug 2003 03:52:34 -0000	1.91
+++ costume.cpp	11 Aug 2003 06:24:19 -0000	1.92
@@ -69,11 +69,14 @@
 	uint scal;
 	bool use_scaling;
 	byte startScaleIndexX;
+	byte newAmiCost;
 	int ex1, ex2;
 	int y_top, y_bottom;
 	int x_left, x_right;
 	int step;
 	
+	newAmiCost = (_vm->_version == 5) && (_vm->_features & GF_AMIGA);
+
 	CHECK_HEAP
 
 	v1.scaletable = cost_scaleTable;
@@ -205,7 +208,7 @@
 		if (!use_scaling)
 			skip = -v1.x;
 		if (skip > 0) {
-			if (!(_vm->_features & GF_AMIGA)) {
+			if (!newAmiCost) {
 				v1.skip_width -= skip;
 
 				if (_loaded._format == 0x57)
@@ -226,7 +229,7 @@
 		if (!use_scaling)
 			skip = x_right - _vm->_screenWidth;
 		if (skip > 0) {
-			if (!(_vm->_features & GF_AMIGA)) {
+			if (!newAmiCost) {
 				v1.skip_width -= skip;
 
 				if (_loaded._format == 0x57)
@@ -275,7 +278,7 @@
 
 	if (_loaded._format == 0x57)
 		procC64();
-	else if (_vm->_features & GF_AMIGA && _vm->_version == 5)
+	else if (newAmiCost)
 		proc3_ami();
 	else
 		proc3();





More information about the Scummvm-git-logs mailing list