Update copyright notice

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

diff --git a/src/lib/global/init.c b/src/lib/global/init.c
index 395ebffba0d0d67077209d487cc7658e6d0ab1f1..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-2009, 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,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -38,6 +37,7 @@
 #include "plane.h"
 #include "product.h"
 #include "prototypes.h"
+#include "sect.h"
 #include "ship.h"
 
 static void init_mchr(void);
@@ -47,6 +47,8 @@ static void init_plchr(void);
 void
 global_init(void)
 {
+    if (opt_RAILWAYS)
+       intrchr[INT_RAIL].in_enable = 0;
     init_pchr();
     init_mchr();
     init_plchr();
@@ -58,6 +60,8 @@ init_mchr(void)
     struct mchrstr *mp;
 
     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;
     }
@@ -69,6 +73,8 @@ init_plchr(void)
     struct plchrstr *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;
     }
@@ -79,7 +85,9 @@ init_pchr(void)
 {
     struct pchrstr *p;
 
-    for (p = pchr; p->p_name; 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;