Merge branch 'master' into dev

2014-05-21 16:34:38 +01:00 · 2014-05-21 16:34:38 +01:00 · 40982ef496
commit 40982ef496
parent fbc7169d21 5ce708f46b
1 changed files with 1 additions and 1 deletions
--- a/src/player.c
+++ b/src/player.c
@ -1819,7 +1819,7 @@ void player_think(Pilot* pplayer) {
  }

  /* PLAYER_FACE will take over navigation. */
-  if(player_isFlag(PLAYER_FACE)) {
+  else if(player_isFlag(PLAYER_FACE)) {
    if(player->target != PLAYER_ID)
      pilot_face(pplayer,
                 vect_angle(&player->solid->pos,