Update copyright notice

[empserver] / src / lib / global / init.c

diff --git a/src/lib/global/init.c b/src/lib/global/init.c
index 28b3f7fafa8e5953ca90126126bf3e639a066a4f..937ae2b56426dd59401fac5f646e1da54515b929 100644 (file)
--- a/src/lib/global/init.c
+++ b/src/lib/global/init.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,31 +14,31 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  init.c: Initialize global unit arrays
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1997
  */
 
-#include "misc.h"
-#include "ship.h"
+#include <config.h>
+
+#include "optlist.h"
 #include "plane.h"
 #include "product.h"
-#include "nat.h"
-#include "optlist.h"
-#include "global.h"
+#include "prototypes.h"
+#include "sect.h"
+#include "ship.h"
 
 static void init_mchr(void);
 static void init_pchr(void);
@@ -47,27 +47,23 @@ static void init_plchr(void);
 void
 global_init(void)
 {
+    if (opt_RAILWAYS)
+       intrchr[INT_RAIL].in_enable = 0;
     init_pchr();
     init_mchr();
     init_plchr();
-    /* the same thing should be done for units... */
 }
 
 static void
 init_mchr(void)
 {
     struct mchrstr *mp;
-    int n;
 
-    for (mp = mchr, n = 0; n < shp_maxno; n++, mp++) {
-       if (mp->m_nxlight)
-           mp->m_flags |= M_XLIGHT;
-       if (mp->m_nchoppers)
-           mp->m_flags |= M_CHOPPER;
+    for (mp = mchr; mp->m_name; mp++) {
+       if (!mp->m_name[0])
+           continue;
        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;
     }
 }
 
@@ -75,9 +71,10 @@ static void
 init_plchr(void)
 {
     struct plchrstr *pp;
-    int pcount;
 
-    for (pp = plchr, pcount = 0; pcount < pln_maxno; pcount++, pp++) {
+    for (pp = plchr; pp->pl_name; pp++) {
+       if (!pp->pl_name[0])
+           continue;
        if (pp->pl_flags & P_M)
            pp->pl_flags |= P_V;
     }
@@ -87,9 +84,10 @@ static void
 init_pchr(void)
 {
     struct pchrstr *p;
-    int pcount;
 
-    for (p = pchr, pcount = 0; pcount < prd_maxno; pcount++, p++) {
+    for (p = pchr; p->p_sname; p++) {
+       if (!p->p_sname[0])
+           continue;
        if (opt_GO_RENEW) {
            if (p->p_type == I_DUST || p->p_type == I_OIL)
                p->p_nrdep = 0;