--- a/src/proto2/Physics.cc Fri Nov 28 18:23:57 2008 +0000
+++ b/src/proto2/Physics.cc Fri Nov 28 22:26:23 2008 +0000
@@ -35,8 +35,10 @@
return tick_counter;
}
-PhysicsObject::PhysicsObject (PhysicsWorld &world, float mass, Vector position, Vector velocity)
- : world(world), mass(mass), position(position), velocity(velocity), inAir(true), facing(3) {
+PhysicsObject::PhysicsObject (PhysicsWorld &world, float mass,
+ Vector position, Vector velocity)
+ : world(world), mass(mass), position(position),
+ velocity(velocity), facingRight(true), inAir(true) {
world.addObject(this);
}
@@ -372,9 +374,9 @@
//Engine::log(DEBUG, "PhysicsObject.changeAim") << "Player aim: " << this->aim;
}
-void PhysicsObject::setFacing(bool right) {
+void PhysicsObject::setFacing(bool facingRight) {
//Engine::log(DEBUG, "PhysicsObject.setFacing") << "Facing: " << right;
- this->facing = right;
+ this->facingRight = facingRight;
}
void PhysicsObject::updatePhysics (Vector position, Vector velocity, bool inAir) {
@@ -388,7 +390,7 @@
}
bool PhysicsObject::getFacing() {
- return this->facing;
+ return this->facingRight;
}
float PhysicsObject::getAim() {