Conflict.
--- 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)