[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.249,1.250

kirben kirben at users.sourceforge.net
Wed Sep 14 02:38:18 CEST 2005


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

Modified Files:
	object.cpp 
Log Message:

Selection screen in C64 maniac works.


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- object.cpp	14 Sep 2005 04:18:29 -0000	1.249
+++ object.cpp	14 Sep 2005 09:37:17 -0000	1.250
@@ -333,8 +333,15 @@
 	for (i = 1; i < _numLocalObjects; i++) {
 		if ((_objs[i].obj_nr < 1) || getClass(_objs[i].obj_nr, kObjectClassUntouchable))
 			continue;
-		if ((_version <= 2) && _objs[i].state & 0x2)
-			continue;
+
+		if (_platform == Common::kPlatformC64 && _gameId == GID_MANIAC) {
+			if (_objs[i].flags == 0 && _objs[i].state & 0x2)
+				continue;
+		} else {
+			if (_version <= 2 && _objs[i].state & 0x2)
+				continue;
+		}
+
 		b = i;
 		do {
 			a = _objs[b].parentstate;
@@ -698,6 +705,7 @@
 	ptr -= 2;
 
 	od->obj_nr = *(ptr + 6);
+	od->flags = *(ptr + 7);
 
 	od->x_pos = *(ptr + 8) * 8;
 	od->y_pos = ((*(ptr + 9)) & 0x7F) * 8;





More information about the Scummvm-git-logs mailing list