Update of /cvsroot/netrek/server/Vanilla/robots
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv693/robots

Modified Files:
	Makefile.in detonate.c roboshar.c 
Log Message:
libnetrek.a

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.in	10 Apr 2006 10:56:33 -0000	1.3
+++ Makefile.in	22 Apr 2006 11:31:53 -0000	1.4
@@ -1,103 +1,61 @@
-# Change CONFIG to the .mk file that matches your system
-
 CONFIG = system.mk
 VPATH = @srcdir@
 srcdir = @srcdir@
 
-# Do Not Change anything below this line. It should be setup in config
-
 include ../$(CONFIG)
 
 INSTALL = @INSTALL@
 INSTALLPROG = @INSTALL_PROGRAM@
 INSTALLDATA = @INSTALL_DATA@
 
-# this is for revised ntserv/struct.h
-
-CFLAGS = $(EXTRAINCS) $(FLAGS) -DROBOT -I. -I${srcdir} -I../include -I${srcdir}/../include
+CFLAGS = $(EXTRAINCS) $(FLAGS) -DROBOT -I. -I../include
 
 LIBS = $(EXTRALIBS)
 
 TOOLDIR= $(LIBDIR)/tools
 
-GETPATH = getpath.o ../ntserv/data.o
-
 LINTFLAGS = -habxc $(EXTRAINCS) $(FLAGS)
 
-#	Common Objects
-
-C_OBJS = ../ntserv/data.o detonate.o  enter.o ../ntserv/getship.o interface.o \
-	../ntserv/orbit.o ../ntserv/phaser.o ../ntserv/sintab.o \
-	../ntserv/openmem.o  sysdefaults.o ../ntserv/torp.o  \
-	../ntserv/util.o $(RANDOMO) ../ntserv/getpath.o ../ntserv/smessage.o \
-	roboshar.o ../ntserv/slotmaint.o ../ntserv/distress.o \
-	../ntserv/ltd_stats.o ../ntserv/bay.o 
-
-#	Puck Objects
-
-PUCK_OBJS = puck.o  puckmove.o commands_puck.o $(C_OBJS)
-
-#	Mars (dogfighter) Objects
-
-M_OBJS = mars.o marsmove.o commands_mars.o $(C_OBJS)
-
-#	Robot Objects
-
-R_OBJS = robotII.o rmove.o commands.o $(C_OBJS)
-
-#       basepractice object files
-
-B_OBJS = basep.o commands_basep.o $(C_OBJS)  
-
-#       newbie server object files
-
-N_OBJS = newbie.o commands_newbie.o $(C_OBJS)
-
-#       pre-T server object files
-
-P_OBJS = pret.o commands_pret.o $(C_OBJS)
-
-#	INL Objects
-
-I_OBJS = inl.o inlcomm.o inlcmds.o gencmds.o $(C_OBJS)
-
+C_OBJS = $(RANDOMO) roboshar.o ../ntserv/libnetrek.a
 
-SRCS = ${srcdir}/puck.c ${srcdir}/puckmove.c ${srcdir}/mars.c \
-	${srcdir}/marsmove.c ${srcdir}/robotII.c ${srcdir}/rmove.c \
-	${srcdir}/../ntserv/getpath.c ${srcdir}/../ntserv/data.c \
-	${srcdir}/detonate.c  ${srcdir}/../ntserv/enter.c \
-	${srcdir}/../ntserv/getship.c  ${srcdir}/../ntserv/interface.c \
-	${srcdir}/../ntserv/orbit.c  ${srcdir}/../ntserv/phaser.c \
-	${srcdir}/../ntserv/sintab.c ${srcdir}/../ntserv/openmem.c \
-	${srcdir}/../ntserv/sysdefaults.c ${srcdir}/../ntserv/torp.c \
-	${srcdir}/../ntserv/util.c $(RANDOMC) ${srcdir}/../ntserv/commands.c \
-	${srcdir}/../ntserv/smessage.c ${srcdir}/basep.c  ${srcdir}/../ntserv/wander2.c \
-	${srcdir}/newbie.c ${srcdir}/inl.c ${srcdir}/inlcomm.c \
-	${srcdir}/../ntserv/slotmaint.c ${srcdir}/inlcmds.c \
-	${srcdir}/../ntserv/gencmds.c ${srcdir}/pret.c
+SRCS = ${srcdir}/puck.c ${srcdir}/puckmove.c \
+	${srcdir}/mars.c ${srcdir}/marsmove.c \
+	${srcdir}/robotII.c ${srcdir}/rmove.c \
+	$(RANDOMC) ${srcdir}/../ntserv/commands.c \
+	${srcdir}/basep.c \
+	${srcdir}/newbie.c \
+	${srcdir}/inl.c ${srcdir}/inlcomm.c ${srcdir}/inlcmds.c \
+	${srcdir}/pret.c
 
 EXECS =	puck mars robotII basep newbie inl pret
 
 all: $(PMAKE) $(EXECS)
 
+PUCK_OBJS = puck.o puckmove.o commands_puck.o $(C_OBJS)
 puck: $(PMAKE) $(PUCK_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o puck $(PUCK_OBJS) $(EXTRALIBS)
 
+M_OBJS = mars.o marsmove.o commands_mars.o $(C_OBJS)
 mars: $(PMAKE) $(M_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o mars $(M_OBJS) $(EXTRALIBS)
 
+R_OBJS = robotII.o rmove.o commands.o $(C_OBJS)
 robotII: $(PMAKE) $(R_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o robotII  $(R_OBJS) $(EXTRALIBS)
 
+B_OBJS = basep.o commands_basep.o $(C_OBJS)  
 basep: $(PMAKE) $(B_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o basep $(B_OBJS) $(EXTRALIBS)
 
+N_OBJS = newbie.o commands_newbie.o $(C_OBJS)
 newbie: $(PMAKE) $(N_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o newbie $(N_OBJS) $(EXTRALIBS)
 
+P_OBJS = pret.o commands_pret.o $(C_OBJS)
 pret: $(PMAKE) $(P_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o pret $(P_OBJS) $(EXTRALIBS)
 
+I_OBJS = inl.o inlcomm.o inlcmds.o $(C_OBJS)
 inl: $(PMAKE) $(I_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o inl $(I_OBJS) $(EXTRALIBS)
 
@@ -107,18 +65,6 @@
 commands_puck.o: $(PMAKE) ${srcdir}/../ntserv/commands.c
 	$(CC) $(CFLAGS) $(DEP) -DPUCK -c ${srcdir}/../ntserv/commands.c -o commands_puck.o
 
-gencmds.o: $(PMAKE) ${srcdir}/../ntserv/gencmds.c
-	$(CC) $(CFLAGS) $(DEP) -c ${srcdir}/../ntserv/gencmds.c
-
-sysdefaults.o: $(PMAKE) ${srcdir}/../ntserv/sysdefaults.c
-	$(CC) $(CFLAGS) $(DEP) -c ${srcdir}/../ntserv/sysdefaults.c
-
-interface.o: $(PMAKE) ${srcdir}/../ntserv/interface.c
-	$(CC) $(CFLAGS) $(DEP) -c ${srcdir}/../ntserv/interface.c
-
-enter.o: $(PMAKE) ${srcdir}/../ntserv/enter.c
-	$(CC) $(CFLAGS) $(DEP) -c ${srcdir}/../ntserv/enter.c
-
 commands.o: $(PMAKE) ${srcdir}/../ntserv/commands.c
 	$(CC) $(CFLAGS) $(DEP) -c ${srcdir}/../ntserv/commands.c -o commands.o
 
@@ -149,9 +95,6 @@
 	$(INSTALLPROG) $(INSTALLOPTS) ${srcdir}/end_tourney.pl $(DESTDIR)$(LIBDIR)/end_tourney.pl
 	$(INSTALLPROG) $(INSTALLOPTS) ${srcdir}/auto-archive.pl $(DESTDIR)$(LIBDIR)/auto-archive.pl
 
-updated: update.o ../ntserv/data.o getpath.o
-	$(CC) $(CFLAGS) -o updated  update.o data.o getpath.o $(EXTRALIBS)
-
 lint: $(SRCS)
 	lint $(LINTFLAGS) -u $?
 	touch lint

Index: roboshar.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/roboshar.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- roboshar.c	21 Mar 2005 05:23:46 -0000	1.1
+++ roboshar.c	22 Apr 2006 11:31:53 -0000	1.2
@@ -157,3 +157,13 @@
     return((u_char) nint((atan2((double) (x2 - x1),
         (double) (y1 - y2)) / M_PI * 128.)));
 }
+
+/*
+ * Null client packet sending function for ntserv specific code in
+ * enter.c and interface.c so that we can avoid compiling it in the
+ * robots directory, and use libnetrek instead.
+ */
+void sendClientPacket(void *ignored)
+{
+  return;
+}

Index: detonate.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/detonate.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- detonate.c	21 Mar 2005 05:23:46 -0000	1.1
+++ detonate.c	22 Apr 2006 11:31:53 -0000	1.2
@@ -1,3 +1,5 @@
+/* apparently obsolete, use ntserv/detonate.c */
+
 /*
  * detonate.c
  */
@@ -5,7 +7,6 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/ipc.h>
 #include "defs.h"
 #include "struct.h"
 #include "data.h"
@@ -15,8 +16,7 @@
             (((a)->p_team == (b)->p_team) && !((a)->p_flags & PFPRACTR))
 
 
-void
-detothers ()
+void detothers ()
 {
   int dx, dy;
   struct player *j;