From bee3f4aa88ab0ec41e10af0caf5dd813dd54a798 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 6 Nov 2005 12:06:10 +0000
Subject: [PATCH] (nullify_objects): Fix option NO_OIL.  The attempt to remove
 ships with capability M_OIL from mchr[] actually replaced them with
 sentinels.  Just clear the capability instead.

---
 src/server/main.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/server/main.c b/src/server/main.c
index 6b01678a..4a2778ae 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -516,10 +516,8 @@ nullify_objects(void)
 	    mchr[i].m_hcm = 0;
 	if (opt_NO_LCMS)
 	    mchr[i].m_lcm = 0;
-	if (opt_NO_OIL) {
-	    if (mchr[i].m_flags & M_OIL)
-		mchr[i].m_name = 0;
-	}
+	if (opt_NO_OIL)
+	    mchr[i].m_flags &= ~M_OIL;
     }
     for (i = 0; i < nuk_maxno; i++) {
 	if (opt_NO_HCMS)