From e47465570a4f39b09de4afca2538fae39a34b232 Mon Sep 17 00:00:00 2001
From: Ron Koenderink <rkoenderink@yahoo.ca>
Date: Tue, 22 Nov 2005 23:19:59 +0000
Subject: [PATCH] (mchr[],m_flags,m_nland): Remove M_UNIT from m_flags in
 mchr[]. It is not used.

---
 include/ship.h        | 2 --
 src/lib/global/init.c | 2 --
 src/lib/global/nsc.c  | 1 -
 src/lib/global/ship.c | 2 +-
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/include/ship.h b/include/ship.h
index e3e1112d..e7554441 100644
--- a/include/ship.h
+++ b/include/ship.h
@@ -174,8 +174,6 @@ struct mchrstr {
 #define M_CHOPPER	bit(16)	/* can hold choppers */
 #define M_OILER		bit(17)	/* can re-fuel ships */
 #define M_SUPPLY	bit(18)	/* Can supply units/sects/ships */
-/* M_UNIT will be automatically set in init_global() if m_nland > 0 */
-#define M_UNIT		bit(19)	/* Can carry units */
 #define M_ANTIMISSILE   bit(20)	/* Shoot down missile */
 
 #define getship(n, p) \
diff --git a/src/lib/global/init.c b/src/lib/global/init.c
index 2d5d9076..3692e717 100644
--- a/src/lib/global/init.c
+++ b/src/lib/global/init.c
@@ -63,8 +63,6 @@ init_mchr(void)
 	    mp->m_flags |= M_CHOPPER;
 	if (mp->m_nplanes && !(mp->m_flags & M_MSL || mp->m_flags & M_FLY))
 	    mp->m_flags |= M_MSL;
-	if (mp->m_nland)
-	    mp->m_flags |= M_UNIT;
     }
 }
 
diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c
index da7d4248..7082cb98 100644
--- a/src/lib/global/nsc.c
+++ b/src/lib/global/nsc.c
@@ -569,7 +569,6 @@ struct symbol ship_chr_flags[] = {
     {M_CHOPPER, "chopper"},
     {M_OILER, "oiler"},
     {M_SUPPLY, "supply"},
-    {M_UNIT, "unit"},
     {M_ANTIMISSILE, "anti-missile"},
     {0, NULL}
 };
diff --git a/src/lib/global/ship.c b/src/lib/global/ship.c
index d1040309..406c31db 100644
--- a/src/lib/global/ship.c
+++ b/src/lib/global/ship.c
@@ -38,7 +38,7 @@
 /*
  * marine characteristics -- ship capabilities descriptions
  * 
- * Note, that you should not set the flags M_XLIGHT, M_UNIT, or M_CHOPPER
+ * Note, that you should not set the flags M_XLIGHT or M_CHOPPER
  * here.  They will be automatically set by init_global() when the server
  * starts if the ship can carry a non-zero amount of those things.
  * Also note that if nplanes > 0 and M_FLY is not set, then M_MSL will