From 30a7443be9ca61eeee3f2a2128b12598f2f3fc70 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Sat, 3 Apr 2021 19:06:41 -0400
Subject: Abort turbo mode if fighting but have no guns

---
 taipan.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/taipan.c b/taipan.c
index 77d0616..65a017a 100644
--- a/taipan.c
+++ b/taipan.c
@@ -1266,8 +1266,8 @@ char sea_battle(char id, int num_ships) {
 			// cputs("We have no guns");
 			print_msg(M_we_have_no_guns);
 			cprint_taipan_bangbang();
-			set_orders();
 			turbo = 0;
+			set_orders();
 		} else if (orders == 3) {
 			choice = 0;
 			amount = 0;
@@ -1386,6 +1386,9 @@ char sea_battle(char id, int num_ships) {
 				print_msg(M_we_got_away);
 				cprint_taipan_bang();
 				good_joss_sound();
+				/* don't use set_orders() here! it allows changing from Run
+					to Fight, *after* getting away, so you end up getting booty
+					when you ran. */
 				timed_getch();
 				num_ships = 0;
 			} else {
-- 
cgit v1.2.3