CVS update: Vanilla/ntserv

[Vanilla CVS Development <vanilla-devel@us.netrek.org>]

Date:	Thursday December 30, 1999 @ 0:40
Author:	cameron

Update of /home/netrek/cvsroot/Vanilla/ntserv
In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv7254/ntserv

Modified Files:
	Makefile daemonII.c defs.h 
Log Message:
Mass changes (see ChangeLog) prior to 2.9pl4 release.


****************************************

Index: Vanilla/ntserv/Makefile
diff -u Vanilla/ntserv/Makefile:1.17 Vanilla/ntserv/Makefile:1.18
--- Vanilla/ntserv/Makefile:1.17	Fri Apr 30 15:18:40 1999
+++ Vanilla/ntserv/Makefile	Thu Dec 30 00:40:01 1999
@@ -15,14 +15,14 @@
 	    startrobot.o  sysdefaults.o  timecheck.o  torp.o  util.o  \
 	    warning.o ping.o $(RANDOMO) getpath.o $(STRDUPO) features.o \
 	    distress.o transwarp.o gencmds.o ntscmds.o openmem.o feature.o \
-	    queue.o slotmaint.o rsa_key.o ltd_stats.o
+	    queue.o slotmaint.o rsa_key.o ltd_stats.o lock.o
 
 
 #	daemonII object files
 
 D_OBJS =    daemonII.o  sintab.o  sysdefaults.o  data.o  slotmaint.o \
 	    util.o  $(RANDOMO) getpath.o getship.o smessage.o  queue.o \
-	    wander2.o openmem.o solicit.o ltd_stats.o
+	    wander2.o openmem.o solicit.o ltd_stats.o lock.o
 
 #	Src files
 
@@ -33,7 +33,7 @@
 	    startrobot.c  timecheck.c  torp.c  util.c  warning.c \
 	    $(RANDOMC)  ping.c getpath.c $(STRDUPC) features.c \
 	    distress.c transwarp.c gencmds.c ntscmds.c openmem.c feature.c \
-	    queue.c slotmaint.c wander2.c sysdefaults.c rsa_key.c
+	    queue.c slotmaint.c wander2.c sysdefaults.c rsa_key.c lock.c
 
 
 SRC = 	    $(R_FILES)  data.h  defs.h  planets.h  struct.h \
Index: Vanilla/ntserv/daemonII.c
diff -u Vanilla/ntserv/daemonII.c:1.28 Vanilla/ntserv/daemonII.c:1.29
--- Vanilla/ntserv/daemonII.c:1.28	Wed Dec 29 18:14:48 1999
+++ Vanilla/ntserv/daemonII.c	Thu Dec 30 00:40:01 1999
@@ -1954,10 +1954,14 @@
       if (status->tourn) {
          credit_killer->p_stats.st_tkills++;
          status->kills++;
+#ifdef NO_CHUNG_CREDIT
 	 if (dude->p_team != victim->p_team) {
+#endif
 	    credit_killer->p_stats.st_tarmsbomb += 5 * victim->p_armies;
 	    status->armsbomb += 5 * victim->p_armies;
+#ifdef NO_CHUNG_CREDIT
 	 }
+#endif
       } else {
          credit_killer->p_stats.st_kills++;
          credit_killer->p_stats.st_armsbomb += 5 * victim->p_armies;
@@ -1985,10 +1989,14 @@
         if (status->tourn) {
             dude->p_stats.st_tkills++;
             status->kills++;
+#ifdef NO_CHUNG_CREDIT
 	    if (dude->p_team != victim->p_team) {
+#endif
 		dude->p_stats.st_tarmsbomb += 5 * victim->p_armies;
 		status->armsbomb += 5 * victim->p_armies;
+#ifdef NO_CHUNG_CREDIT
 	    }
+#endif
         } else {
             dude->p_stats.st_kills++;
             dude->p_stats.st_armsbomb += 5 * victim->p_armies;
Index: Vanilla/ntserv/defs.h
diff -u Vanilla/ntserv/defs.h:1.10 Vanilla/ntserv/defs.h:1.11
--- Vanilla/ntserv/defs.h:1.10	Wed Dec 29 18:07:20 1999
+++ Vanilla/ntserv/defs.h	Thu Dec 30 00:40:01 1999
@@ -1,4 +1,4 @@
-/* $Id: defs.h,v 1.10 1999/12/30 00:07:20 unbelver Exp $
+/* $Id: defs.h,v 1.11 1999/12/30 06:40:01 cameron Exp $
  */
 
 #ifndef _h_defs
@@ -253,6 +253,9 @@
 
 #define N_CAMBOT	"cambot"
 #define N_CAMBOT_OUT	"cambot.pkt"
+
+#define N_NETREKDPID    LIBDIR"/.netrekd.pid"
+#define N_PORTS         LIBDIR"/.ports"
 
 /* Other stuff that Ed added */