From 65bb65f63d221142fb4b9c16b140ccdf55c3a2a0 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Fri, 10 Sep 2004 18:27:53 +0000
Subject: [PATCH] (plnstr): Member pln_fuel was always equal to
 plchr[pln_type].pl_fuel. Replace all uses, so pln_fuel can be removed later.

---
 include/plane.h          | 2 +-
 src/lib/commands/buil.c  | 1 -
 src/lib/commands/pdump.c | 2 +-
 src/lib/commands/pstat.c | 3 ++-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/plane.h b/include/plane.h
index 2fdc26ae..5c82a501 100644
--- a/include/plane.h
+++ b/include/plane.h
@@ -68,7 +68,7 @@ struct plnstr {
     int pln_def;
     int pln_acc;
     int pln_load;
-    int pln_fuel;
+    int pln_fuel;		/* (unused) */
     s_char pln_harden;		/* for missiles */
     s_char pln_nuketype;	/* type of nuclear armament (if any) */
     s_char pln_flags;		/* State of the plane */
diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c
index 93200a03..b689a96f 100644
--- a/src/lib/commands/buil.c
+++ b/src/lib/commands/buil.c
@@ -873,7 +873,6 @@ build_plane(register struct sctstr *sp, register struct plchrstr *pp,
     plane.pln_radius = 0;
     plane.pln_range = UCHAR_MAX; /* will be adjusted by pln_set_tech() */
     plane.pln_range_max = plane.pln_range;
-    plane.pln_fuel = pp->pl_fuel;
     plane.pln_wing = ' ';
     plane.pln_ship = -1;
     plane.pln_land = -1;
diff --git a/src/lib/commands/pdump.c b/src/lib/commands/pdump.c
index 3cd8a922..183c3ebd 100644
--- a/src/lib/commands/pdump.c
+++ b/src/lib/commands/pdump.c
@@ -254,7 +254,7 @@ pdump(void)
 		pr(" %d", plane.pln_load);
 		break;
 	    case 14:
-		pr(" %d", plane.pln_fuel);
+		pr(" %d", plchr[(int)plane.pln_type].pl_fuel);
 		break;
 	    case 15:
 		pr(" %d", plane.pln_harden);
diff --git a/src/lib/commands/pstat.c b/src/lib/commands/pstat.c
index d77014af..fc36ed4f 100644
--- a/src/lib/commands/pstat.c
+++ b/src/lib/commands/pstat.c
@@ -72,7 +72,8 @@ pstat(void)
 	   plane.pln_att,
 	   plane.pln_def,
 	   plane.pln_acc,
-	   plane.pln_range_max, plane.pln_load, plane.pln_fuel);
+	   plane.pln_range_max, plane.pln_load,
+	   plchr[(int)plane.pln_type].pl_fuel);
 	pr("\n");
     }