From 4e1fee762b16081bf556594141bbe30044e34360 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Sat, 28 Dec 2013 23:48:34 +0000
Subject: [PATCH] [Add] Autonav now makes engine noises.

---
 src/player.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/player.c b/src/player.c
index b30057a..14f6705 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1495,12 +1495,15 @@ void player_startAutonav(void) {
 void player_abortAutonav(void) {
   if(player_isFlag(PLAYER_AUTONAV)) {
     player_message("Autonav aborted!");
-    player_acc = 0.; /* Might be acceling. */
     player_rmFlag(PLAYER_AUTONAV);
+
+    /* Get rid of acceleration. */
+    player_accelOver();
+
+    /* Break possible hyperspacing. */
     if(pilot_isFlag(player, PILOT_HYP_PREP)) {
       pilot_hyperspaceAbort(player);
       player_message("Aborting hyperspace sequence.");
-      return;
     }
   }
 }
@@ -1526,11 +1529,11 @@ void player_think(Pilot* pplayer) {
       player_abortAutonav();
 
     if(space_canHyperspace(pplayer)) {
-      player_acc = 0.;
       player_jump();
     }	else {
       pilot_face(pplayer, VANGLE(pplayer->solid->pos));
-      player_acc = 1.;
+      if(player_acc < 1.)
+        player_accel(1.);
   	}
   }
 
@@ -1786,6 +1789,9 @@ void player_jump(void) {
     player_message("You do not have enough fuel to hyperspace jump.");
   else {
     player_message("Preparing for hyperspace.");
+    /* Stop acceleration noise. */
+    player_accelOver();
+    /* Stop possible shooting. */
     pilot_shootStop(player, 0);
     pilot_shootStop(player, 1);
   }