empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(mchr[],m_flags,m_nland): Remove M_UNIT from m_flags in mchr[].

Browse source 
It is not used.
This commit is contained in:
Ron Koenderink 2005-11-22 23:19:59 +00:00
parent d4f52f6ca2
commit e47465570a
4 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/ship.h
View file

@ -174,8 +174,6 @@ struct mchrstr {
#define M_CHOPPER bit(16) /* can hold choppers */ #define M_CHOPPER bit(16) /* can hold choppers */
#define M_OILER bit(17) /* can re-fuel ships */ #define M_OILER bit(17) /* can re-fuel ships */
#define M_SUPPLY bit(18) /* Can supply units/sects/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 M_ANTIMISSILE bit(20) /* Shoot down missile */
#define getship(n, p) \ #define getship(n, p) \

2
src/lib/global/init.c
View file

@ -63,8 +63,6 @@ init_mchr(void)
mp->m_flags |= M_CHOPPER; mp->m_flags |= M_CHOPPER;
if (mp->m_nplanes && !(mp->m_flags & M_MSL || mp->m_flags & M_FLY)) if (mp->m_nplanes && !(mp->m_flags & M_MSL || mp->m_flags & M_FLY))
mp->m_flags |= M_MSL; mp->m_flags |= M_MSL;
if (mp->m_nland)
mp->m_flags |= M_UNIT;
} }
} }

1
src/lib/global/nsc.c
View file

@ -569,7 +569,6 @@ struct symbol ship_chr_flags[] = {
{M_CHOPPER, "chopper"}, {M_CHOPPER, "chopper"},
{M_OILER, "oiler"}, {M_OILER, "oiler"},
{M_SUPPLY, "supply"}, {M_SUPPLY, "supply"},
{M_UNIT, "unit"},
{M_ANTIMISSILE, "anti-missile"}, {M_ANTIMISSILE, "anti-missile"},
{0, NULL} {0, NULL}
}; };

2
src/lib/global/ship.c
View file

@ -38,7 +38,7 @@
/* /*
* marine characteristics -- ship capabilities descriptions * 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 * 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. * 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 * Also note that if nplanes > 0 and M_FLY is not set, then M_MSL will