From 2b31f644dbcc20a1e5befbdd6d8d143cb32befd8 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 13 Sep 2009 11:37:17 -0400
Subject: [PATCH] Enable marine msl. unconditionally, remove option
 PINPOINTMISSILE

Deities can still control them by customizing table plane-chr.
---
 include/econfig-spec.h   |  2 --
 info/Options.t           |  1 -
 info/version.t           |  4 ++--
 src/lib/commands/laun.c  | 15 ++++++---------
 src/lib/global/options.c |  1 -
 src/lib/subs/mslsub.c    |  3 +--
 6 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index b65aa04b..9d14cc48 100644
--- a/include/econfig-spec.h
+++ b/include/econfig-spec.h
@@ -175,8 +175,6 @@ EMPCF_OPT("NO_FORT_FIRE", opt_NO_FORT_FIRE,
     "Disable fortress fire")
 EMPCF_OPT("NO_PLAGUE", opt_NO_PLAGUE,
     "Disable plague")
-EMPCF_OPT("PINPOINTMISSILE", opt_PINPOINTMISSILE,
-    "Enable marine missiles")
 EMPCF_OPT("RAILWAYS", opt_RAILWAYS,
     "Highways double as rail")
 EMPCF_OPT("RES_POP", opt_RES_POP,
diff --git a/info/Options.t b/info/Options.t
index e7059193..811f121e 100644
--- a/info/Options.t
+++ b/info/Options.t
@@ -4,7 +4,6 @@
 .nf
 The following options are from KSU code:
 
-PINPOINT(etc):	Missile exist which target ships instead of sectors
 SAIL:		another way to automatically move ships (may also be buggy)
 
 The following options were introduced in the Chainsaw server:
diff --git a/info/version.t b/info/version.t
index a7924c9c..89eec228 100644
--- a/info/version.t
+++ b/info/version.t
@@ -76,8 +76,8 @@ You are disconnected after 15 minutes of idle time.
 
 Options enabled in this game:
 	ALL_BLEED, BLITZ, BRIDGETOWERS, EASY_BRIDGES, FALLOUT, GODNEWS,
-	INTERDICT_ATT, LANDSPIES, NOFOOD, NOMOBCOST, NO_PLAGUE,
-	PINPOINTMISSILE, RAILWAYS, SAIL, TREATIES
+	INTERDICT_ATT, LANDSPIES, NOFOOD, NOMOBCOST, NO_PLAGUE, RAILWAYS, SAIL,
+	TREATIES
 
 Options disabled in this game:
 	AUTO_POWER, GO_RENEW, GUINEA_PIGS, HIDDEN, LOANS, LOSE_CONTACT, MARKET,
diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c
index 86b21c5e..cfd05db0 100644
--- a/src/lib/commands/laun.c
+++ b/src/lib/commands/laun.c
@@ -222,7 +222,7 @@ launch_missile(struct plnstr *pp, int sublaunch)
 	return RET_SYN;
     if (!check_plane_ok(pp))
 	return RET_FAIL;
-    if (opt_PINPOINTMISSILE && sarg_type(cp) == NS_LIST) {
+    if (sarg_type(cp) == NS_LIST) {
 	if (!(pcp->pl_flags & P_MAR)) {
 	    pr("Missile not designed to attack ships!\n");
 	    return RET_FAIL;
@@ -240,17 +240,16 @@ launch_missile(struct plnstr *pp, int sublaunch)
 	    pr("Bad ship number!\n");
 	    return RET_FAIL;
 	}
-    } /* not PINPOINTMISSILE for ships */
-    else if (!sarg_xy(cp, &sx, &sy)) {
+    } else if (!sarg_xy(cp, &sx, &sy)) {
 	pr("Not a sector!\n");
 	return RET_FAIL;
-    } else if (opt_PINPOINTMISSILE) {
+    } else {
 	if (pcp->pl_flags & P_MAR) {
 	    pr("Missile designed to attack ships!\n");
 	    return RET_FAIL;
 	}
     }
-    /* end PINPOINTMISSILE */
+
     if (mapdist(pp->pln_x, pp->pln_y, sx, sy) > pp->pln_range) {
 	pr("Range too great; try again!\n");
 	return RET_FAIL;
@@ -259,7 +258,7 @@ launch_missile(struct plnstr *pp, int sublaunch)
 	pr("%s not enough shells!\n", prplane(pp));
 	return RET_FAIL;
     }
-    if (opt_PINPOINTMISSILE == 0 || !(pcp->pl_flags & P_MAR)) {
+    if (!(pcp->pl_flags & P_MAR)) {
 	getsect(sx, sy, &sect);
 	if (opt_SLOW_WAR) {
 	    natp = getnatp(player->cnum);
@@ -304,8 +303,7 @@ launch_missile(struct plnstr *pp, int sublaunch)
 	    sectdamage(&sect, dam);
 	    putsect(&sect);
 	}
-    } /* end PINPOINTMISSILE conditional */
-    else if (opt_PINPOINTMISSILE) {	/* else */
+    } else {
 	if (!msl_hit(pp, shp_hardtarget(&target_ship), EF_SHIP,
 		     N_SHP_MISS, N_SHP_SMISS, prship(&target_ship),
 		     target_ship.shp_x, target_ship.shp_y,
@@ -327,7 +325,6 @@ launch_missile(struct plnstr *pp, int sublaunch)
 	if (!target_ship.shp_own)
 	    pr("%s sunk!\n", prship(&target_ship));
     }
-    /* end PINPOINTMISSILE */
     return RET_OK;
 }
 
diff --git a/src/lib/global/options.c b/src/lib/global/options.c
index aad1ec12..fdb2a82b 100644
--- a/src/lib/global/options.c
+++ b/src/lib/global/options.c
@@ -56,7 +56,6 @@ int opt_NOFOOD = 1;
 int opt_NOMOBCOST = 1;
 int opt_NO_FORT_FIRE = 0;
 int opt_NO_PLAGUE = 1;
-int opt_PINPOINTMISSILE = 1;
 int opt_RAILWAYS = 1;
 int opt_RES_POP = 0;
 int opt_SAIL = 1;
diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c
index 657ed03a..4e648cad 100644
--- a/src/lib/subs/mslsub.c
+++ b/src/lib/subs/mslsub.c
@@ -140,8 +140,7 @@ msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item,
 	    sublaunch ? "sub-launched" : cname(pp->pln_own),
 	    xyas(x, y, victim));
 
-    if (opt_PINPOINTMISSILE == 0 ||
-	(pcp->pl_flags & P_T && !(pcp->pl_flags & P_MAR))) {
+    if ((pcp->pl_flags & P_T && !(pcp->pl_flags & P_MAR))) {
 	if (msl_intercept(x, y, pp->pln_own, pcp->pl_def,
 			  sublaunch, P_N, P_O)) {
 	    return 0;