Conflict.
authorekku
Tue, 18 Nov 2008 19:03:09 +0000
changeset 52 8db6726c27fc
parent 51 360208b631c1
child 53 a76ddb2e39fb
Conflict.
src/proto2/Physics.cc
--- a/src/proto2/Physics.cc	Tue Nov 18 18:54:40 2008 +0000
+++ b/src/proto2/Physics.cc	Tue Nov 18 19:03:09 2008 +0000
@@ -16,7 +16,10 @@
 }
 
 void PhysicsWorld::tick () {
-    std::for_each(objects.begin(), objects.end(), mem_fun(&PhysicsObject::tick));
+	for(std::vector<PhysicsObject*>::iterator i = objects.begin(); i != objects.end(); i++) {
+       	(*i)->tick(); 
+  	}
+	//std::for_each(objects.begin(), objects.end(), );
 }
 
 PhysicsObject::PhysicsObject (uint16_t mass, Vector position, Vector velocity, Vector force)