[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.52,1.53

Max Horn fingolfin at users.sourceforge.net
Mon Jan 13 07:08:01 CET 2003


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

Modified Files:
	object.cpp 
Log Message:
indention fix

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- object.cpp	12 Jan 2003 21:53:25 -0000	1.52
+++ object.cpp	13 Jan 2003 15:06:58 -0000	1.53
@@ -445,12 +445,12 @@
 			_objs[i].obj_nr = 0;
 			_objs[i].fl_object_index = 0;
 		} else {
-                        // Nuke all unlocked flObjects
-                        if (!(res.flags[rtFlObject][_objs[i].fl_object_index] & RF_LOCK)) {
-                                nukeResource(rtFlObject, _objs[i].fl_object_index);
-                                _objs[i].obj_nr = 0;
-                                _objs[i].fl_object_index = 0;
-                        } 
+			// Nuke all unlocked flObjects
+			if (!(res.flags[rtFlObject][_objs[i].fl_object_index] & RF_LOCK)) {
+				nukeResource(rtFlObject, _objs[i].fl_object_index);
+				_objs[i].obj_nr = 0;
+				_objs[i].fl_object_index = 0;
+			} 
 		}
 	}
 
@@ -607,7 +607,7 @@
 
 		od->obj_nr = READ_LE_UINT16(ptr + 6);	// ok
 
-		od->width = *(ptr + 11) << 3;	// ok   
+		od->width = *(ptr + 11) << 3;	// ok
 		od->x_pos = *(ptr + 9) << 3;	// ok
 
 		if (*(ptr + 10) & 0x80) {
@@ -1630,8 +1630,8 @@
 {
 	int i;
 
-        for (i = 1; i < _numLocalObjects; i++) {
-                if (!_objs[i].obj_nr)
+	for (i = 1; i < _numLocalObjects; i++) {
+		if (!_objs[i].obj_nr)
 			return i;
 	}
 





More information about the Scummvm-git-logs mailing list