Update copyright notice

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

diff --git a/src/lib/global/init.c b/src/lib/global/init.c
index ba4dfe09156038be71b0e921e46d2a8272bbee47..937ae2b56426dd59401fac5f646e1da54515b929 100644 (file)
--- a/src/lib/global/init.c
+++ b/src/lib/global/init.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -37,6 +37,7 @@
 #include "plane.h"
 #include "product.h"
 #include "prototypes.h"
+#include "sect.h"
 #include "ship.h"
 
 static void init_mchr(void);
@@ -46,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();
@@ -57,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;
     }
@@ -68,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;
     }
@@ -78,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;