[Scummvm-cvs-logs] CVS: scummvm/scumm script_v90he.cpp,2.200,2.201

kirben kirben at users.sourceforge.net
Thu Mar 31 01:56:55 CEST 2005


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

Modified Files:
	script_v90he.cpp 
Log Message:

Add some missing code.


Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.200
retrieving revision 2.201
diff -u -d -r2.200 -r2.201
--- script_v90he.cpp	31 Mar 2005 02:28:14 -0000	2.200
+++ script_v90he.cpp	31 Mar 2005 09:56:14 -0000	2.201
@@ -1806,6 +1806,12 @@
 				r2.top += args2[2];
 				r2.bottom += args2[2];
 			}
+			if (n1 == 3) { 
+				r1.left += args1[1];
+				r1.right += args1[1];
+				r1.top += args1[2];
+				r1.bottom += args1[2];
+			}
 			push(r2.intersects(r1) ? 1 : 0);
 		}
 		break;
@@ -1829,6 +1835,7 @@
 		}
 		break;
 	case 8:
+	case 10:	// TODO: redraw image
 		{
 			Common::Rect r1, r2;
 			getSpriteBounds(args2[0], true, r2);
@@ -1844,6 +1851,12 @@
 				r2.top += args2[2];
 				r2.bottom += args2[2];
 			}
+			if (n1 == 3) { 
+				r1.left += args1[1];
+				r1.right += args1[1];
+				r1.top += args1[2];
+				r1.bottom += args1[2];
+			}
 			push(r2.intersects(r1) ? 1 : 0);
 		}
 		break;
@@ -1866,9 +1879,6 @@
 			push(r2.intersects(r1) ? 1 : 0);
 		}
 		break;
-	case 10:
-		push(0);
-		break;
 	default:
 		error("o90_getPolygonOverlap: default case %d", subOp);
 	}





More information about the Scummvm-git-logs mailing list