From d9c8dbc4496162692c46547622d86a44eddd838b Mon Sep 17 00:00:00 2001 From: Allanis Date: Sat, 16 Mar 2013 23:02:30 +0000 Subject: [PATCH] [Add] 'face' will face targetted planet if no pilot target is selected. --- src/board.c | 4 ++-- src/player.c | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/board.c b/src/board.c index 5366ebb..f42b84f 100644 --- a/src/board.c +++ b/src/board.c @@ -91,7 +91,7 @@ static void board_stealCreds(char* str) { if(p->credits == 0) { // Can't steal from the poor. ;) - player_message("The ship has no SCreds left"); + player_message("The ship has no SCreds."); return; } @@ -104,7 +104,7 @@ static void board_stealCreds(char* str) { player_credits += p->credits; p->credits = 0; board_update(); // Update the lack of credits. - player_message("You manage to steal the ship's Scred"); + player_message("You manage to steal the ship's Scred."); } // Failed to board. diff --git a/src/player.c b/src/player.c index 56ab199..1e18471 100644 --- a/src/player.c +++ b/src/player.c @@ -869,9 +869,16 @@ void gui_free(void) { // Basically uses keyboard input instead of AI input. void player_think(Pilot* player) { // PLAYER_FACE will take over navigation. - if(player_isFlag(PLAYER_FACE) && (player_target != PLAYER_ID)) - pilot_face(player, - vect_angle(&player->solid->pos, &pilot_get(player_target)->solid->pos)); + if(player_isFlag(PLAYER_FACE)) { + if(player_target != PLAYER_ID) + pilot_face(player, + vect_angle(&player->solid->pos, + &pilot_get(player_target)->solid->pos)); + else if(planet_target != -1) + pilot_face(player, + vect_angle(&player->solid->pos, + &cur_system->planets[planet_target].pos)); + } // PLAYER_REVERSE will take over navigation. else if(player_isFlag(PLAYER_REVERSE) && (VMOD(player->solid->vel) > 0.))