ofo's water show 'x' for dead users

my_write() input uin if already got it


git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@11 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

2 files changed, 15 insertions, 14 deletions

diff --git a/include/proto.h b/include/proto.h
index 8122f5d5..5247ac7f 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -1,4 +1,4 @@
-/* $Id: proto.h,v 1.1 2002/03/07 15:13:48 in2 Exp $ */
+/* $Id: proto.h,v 1.2 2002/03/09 10:34:56 in2 Exp $ */
 #ifndef INCLUDE_PROTO_H
 #define INCLUDE_PROTO_H
 
@@ -416,7 +416,7 @@ char *modestring(userinfo_t * uentp, int simple);
 int isvisible(userinfo_t * me, userinfo_t * uentp);
 int t_users();
 int cmpuids(int uid, userinfo_t * urec);
-int my_write(pid_t pid, char *hint, char *id, int flag);
+int my_write(pid_t pid, char *hint, char *id, int flag, userinfo_t *);
 void t_display_new();
 void talkreply();
 int t_monitor();
diff --git a/include/pttstruct.h b/include/pttstruct.h
index 76a196a9..ea1e7d78 100644
--- a/include/pttstruct.h
+++ b/include/pttstruct.h
@@ -1,4 +1,4 @@
-/* $Id: pttstruct.h,v 1.1 2002/03/07 15:13:48 in2 Exp $ */
+/* $Id: pttstruct.h,v 1.2 2002/03/09 10:34:56 in2 Exp $ */
 #ifndef INCLUDE_STRUCT_H
 #define INCLUDE_STRUCT_H
 
@@ -191,23 +191,16 @@ typedef struct {
     int num, page, now, level;
 } gmenu_t;
 
+#define FAVMAX     74		  /* Max boards of Myfavorite */
+#define FAVGMAX    16             /* Max groups of Myfavorite */
+#define FAVGSLEN    8		  /* Max Length of Description String */
+
 typedef struct msgque_t {
     pid_t pid;
     char userid[IDLEN + 1];
     char last_call_in[80];
 } msgque_t;
 
-typedef struct water_t {
-    pid_t   pid;
-    char    userid[IDLEN + 1];
-    msgque_t msg[MAX_REVIEW];
-    int     top, count;
-} water_t;
-
-#define FAVMAX     74		  /* Max boards of Myfavorite */
-#define FAVGMAX    16             /* Max groups of Myfavorite */
-#define FAVGSLEN    8		  /* Max Length of Description String */
-
 typedef struct userinfo_t {
     int uid;                      /* Used to find user name in passwd file */
     pid_t pid;                    /* kill() to notify user of talk request */
@@ -258,6 +251,14 @@ typedef struct userinfo_t {
     int mind;
 } userinfo_t;
 
+typedef struct water_t {
+    pid_t   pid;
+    char    userid[IDLEN + 1], alive;
+    int     top, count;
+    msgque_t   msg[MAX_REVIEW];
+    userinfo_t *uin;
+} water_t;
+
 typedef struct {
     fileheader_t *header;
     char mtitle[STRLEN];