--- a/src/Player.cc	Sun Dec 07 20:37:21 2008 +0000
+++ b/src/Player.cc	Sun Dec 07 20:44:45 2008 +0000
@@ -110,21 +110,17 @@
     // handle movement left/right by applying a horizontal force, but limit the player's speed
     // also update facing if needed
     if ((input & INPUT_MOVE_LEFT) && (velocity.x > -PLAYER_MAX_SPEED)) {
-        setFacing(false);
+        if(!(input & INPUT_MOVE_RIGHT))
+            setFacing(false);
         move_force.x -= PLAYER_MOVE_FORCE;
-
     }
 
     if ((input & INPUT_MOVE_RIGHT) && (velocity.x < PLAYER_MAX_SPEED)) {
-        setFacing(true);
+        if(!(input & INPUT_MOVE_LEFT))
+            setFacing(true);
         move_force.x += PLAYER_MOVE_FORCE;
     }
 
-    if ((input & INPUT_MOVE_LEFT) && (input & INPUT_MOVE_RIGHT)) {
-        if(velocity.x != 0)
-            setFacing(velocity.x > 0);
-    }
-
     // handle aim by creating a aim angle delta
     if (input & INPUT_AIM_UP)
         aim_delta += CROSSHAIR_ANGLE_SPEED;