From 32462e21d418149d95a2f5857d3acd5bc7274fc7 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Thu, 21 Mar 2013 21:35:53 +0000
Subject: [PATCH] [Fix] Stop pilot turning/accelerating when dying.
---
dat/outfit.xml | 2 +-
gfx/outfit/store/{capacitator.png => capacitor.png} | Bin
src/player.c | 7 ++++++-
3 files changed, 7 insertions(+), 2 deletions(-)
rename gfx/outfit/store/{capacitator.png => capacitor.png} (100%)
diff --git a/dat/outfit.xml b/dat/outfit.xml
index f0b53c1..21b18be 100644
--- a/dat/outfit.xml
+++ b/dat/outfit.xml
@@ -181,7 +181,7 @@
<mass>3</mass>
<price>75000</price>
<description>An enhancement for the shield power system, allowing it to resist much heavier fire.</description>
- <gfx_store>capacitator</gfx_store>
+ <gfx_store>capacitor</gfx_store>
</general>
<specific type="15">
<shield>15</shield>
diff --git a/gfx/outfit/store/capacitator.png b/gfx/outfit/store/capacitor.png
similarity index 100%
rename from gfx/outfit/store/capacitator.png
rename to gfx/outfit/store/capacitor.png
diff --git a/src/player.c b/src/player.c
index 756ea2f..ea11762 100644
--- a/src/player.c
+++ b/src/player.c
@@ -927,7 +927,12 @@ void gui_free(void) {
// Basically uses keyboard input instead of AI input.
void player_think(Pilot* player) {
// Last I checked, the dead didn't think..
- if(pilot_isFlag(player, PILOT_DEAD)) return;
+ if(pilot_isFlag(player, PILOT_DEAD)) {
+ // No point in accelerating or turning.
+ player->solid->dir_vel = 0.;
+ vect_pset(&player->solid->force, 0., 0.);
+ return;
+ }
// PLAYER_FACE will take over navigation.
if(player_isFlag(PLAYER_FACE)) {