[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.98,1.99 actor.h,1.13,1.14 object.cpp,1.80,1.81

Max Horn fingolfin at users.sourceforge.net
Fri Jul 26 09:14:02 CEST 2002


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

Modified Files:
	actor.cpp actor.h object.cpp 
Log Message:
fixed an ignoreboxes bug in MI1VGA

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- actor.cpp	26 Jul 2002 15:55:21 -0000	1.98
+++ actor.cpp	26 Jul 2002 16:13:04 -0000	1.99
@@ -1392,6 +1392,25 @@
 	}
 }
 
+void Actor::classChanged(int cls, bool value)
+{
+	switch(cls) {
+	case 20:	// Never clip
+		break;
+	case 21:	// Always clip
+		break;
+	case 22:	// Ignore boxes
+		ignoreBoxes = value;
+		break;
+	case 29:	// Y flip
+		break;
+	case 30:	// X flip
+		break;
+	case 31:	// ??
+		break;
+	}
+}
+
 bool Actor::isInClass(int cls)
 {
 	return _vm->getClass(number, cls);

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- actor.h	18 Jul 2002 15:45:10 -0000	1.13
+++ actor.h	26 Jul 2002 16:13:04 -0000	1.14
@@ -169,6 +169,8 @@
 	void setAnimVar(byte var, int value) {
 		animVariable[var] = value;
 	}
+	
+	void classChanged(int cls, bool value);
 
 protected:
 	bool isInClass(int cls);

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- object.cpp	16 Jul 2002 21:03:14 -0000	1.80
+++ object.cpp	26 Jul 2002 16:13:04 -0000	1.81
@@ -61,6 +61,10 @@
 		_classData[obj] |= (1 << (cls - 1));
 	else
 		_classData[obj] &= ~(1 << (cls - 1));
+
+	if (1 <= obj && obj < NUM_ACTORS) {
+		_actors[obj].classChanged(cls, set);
+	}
 }
 
 int Scumm::getOwner(int obj)





More information about the Scummvm-git-logs mailing list