--- a/src/Player.cc	Mon Dec 08 01:31:09 2008 +0000
+++ b/src/Player.cc	Mon Dec 08 01:38:43 2008 +0000
@@ -20,8 +20,8 @@
 const int img_width = 17;
 
 Player::Player(GameState &state, Vector position, bool visible) : 
-    PhysicsObject(state.world, PLAYER_MASS, position, Vector(0, 0), PLAYER), state(state), visible(visible),
-    weapons(buildWeaponsList()), selectedWeapon(0), animation_step(0), rope(*this) 
+    PhysicsObject(state.world, PLAYER_MASS, position, Vector(0, 0), PLAYER, PLAYER_COLLISION_ELASTICITY), state(state), 
+    visible(visible), weapons(buildWeaponsList()), selectedWeapon(0), animation_step(0), rope(*this) 
 {
     // XXX: populate weapons from somewhere else
 
@@ -36,9 +36,6 @@
     // Initialize the shape of the player (salmiakki shape)
     setShape(shape);
 
-    // XXX: this should be a PhysicsObject constructor arg
-    collision_elasticity = PLAYER_COLLISION_ELASTICITY;
-
     // add to GameState players list
     state.addPlayer(this);
 }