[netrek-cvs] server/Vanilla/include data.h, 1.5, 1.6 proto.h, 1.8, 1.9 struct.h, 1.8, 1.9

[James Cameron]

Update of /cvsroot/netrek/server/Vanilla/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26631/include

Modified Files:
	data.h proto.h struct.h 
Log Message:
merge from jerub darcs 2006-05-12

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/data.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- data.h	26 Apr 2006 09:52:43 -0000	1.5
+++ data.h	12 May 2006 03:44:48 -0000	1.6
@@ -57,6 +57,7 @@
 extern struct player *players;
 extern struct player *me;
 extern struct torp *torps;
+extern struct context *context;
 extern struct status *status;
 extern struct ship *myship;
 extern struct stats *mystats;

Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/struct.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- struct.h	26 Apr 2006 09:52:43 -0000	1.8
+++ struct.h	12 May 2006 03:44:48 -0000	1.9
@@ -72,6 +72,10 @@
 
 /* End of waitq related stuff */
 
+struct context {
+    int daemon;         /* pid_t of daemon */
+};
+
 struct status {
     int		active;
     u_char	tourn;		/* Tournament mode? */
@@ -80,6 +84,7 @@
     /* Use long for this, so it never wraps */
     double	timeprod;
     int		gameup;
+    /* CAUTION, adding to this struct invalidates var/global */
 };
 
 /* The following defines are for gameup field */
@@ -592,6 +597,7 @@
 struct memory {
     struct player	players[MAXPLAYER];
     struct torp		torps[MAXPLAYER * (MAXTORP + MAXPLASMA)];
+    struct context	context[1];
     struct status	status[1];
     struct planet	planets[MAXPLANETS];
     struct phaser	phasers[MAXPLAYER];

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/proto.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- proto.h	6 May 2006 14:02:37 -0000	1.8
+++ proto.h	12 May 2006 03:44:48 -0000	1.9
@@ -148,7 +148,7 @@
 int bounceRSAClientType(int from);
 #endif
 int bounceWhois(int from);
-int check_command(struct message *mess);
+int do_check_command(struct message *mess);
 
 /* openmem.c */
 int openmem(int trystart);
@@ -203,9 +203,11 @@
 
 /* smessage.c */
 void bounce(int bounceto, const char *, ...);
+void lmessage(const char *fmt, ...);
 void pmessage(int recip, int group, char *address, const char *, ...);
 void pmessage2(int recip, int group, char *address, u_char from,
                const char *, ...);
+void do_message_post_set(int (*proposed)(struct message *message));
 
 /* socket.c */
 struct player_spacket;