Merge branch 'master' into dev

This commit is contained in:
Allanis 2014-05-21 16:34:38 +01:00
commit 40982ef496

View File

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