equal
deleted
inserted
replaced
320 if (this->aim > PLAYER_AIM_MAX) this->aim = PLAYER_AIM_MAX; |
320 if (this->aim > PLAYER_AIM_MAX) this->aim = PLAYER_AIM_MAX; |
321 if (this->aim < PLAYER_AIM_MIN) this->aim = PLAYER_AIM_MIN; |
321 if (this->aim < PLAYER_AIM_MIN) this->aim = PLAYER_AIM_MIN; |
322 //Engine::log(DEBUG, "PhysicsObject.changeAim") << "Player aim: " << this->aim; |
322 //Engine::log(DEBUG, "PhysicsObject.changeAim") << "Player aim: " << this->aim; |
323 } |
323 } |
324 |
324 |
|
325 ObjectType PhysicsObject::getType (void) const { |
|
326 return this->type; |
|
327 } |
|
328 |
325 void PhysicsObject::setFacing (FacingDirection facing) { |
329 void PhysicsObject::setFacing (FacingDirection facing) { |
326 this->facing = facing; |
330 this->facing = facing; |
327 } |
331 } |
328 |
332 |
329 void PhysicsObject::updatePhysics (Vector position, Vector velocity, bool inAir, FacingDirection facing, float aim) { |
333 void PhysicsObject::updatePhysics (Vector position, Vector velocity, bool inAir, FacingDirection facing, float aim) { |