From 969cf2355fa24662973f8b305f3b7a7236e6d898 Mon Sep 17 00:00:00 2001
From: bbs <bbs@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Tue, 20 May 2003 02:03:35 +0000
Subject: :p

git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@885 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 include/proto.h |  4 ++--
 mbbsd/mbbsd.c   | 10 +---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/include/proto.h b/include/proto.h
index 3aae3190..298f0a2b 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -1,4 +1,4 @@
-/* $Id: proto.h,v 1.42 2003/05/20 02:01:09 bbs Exp $ */
+/* $Id: proto.h,v 1.43 2003/05/20 02:03:35 bbs Exp $ */
 #ifndef INCLUDE_PROTO_H
 #define INCLUDE_PROTO_H
 
@@ -115,7 +115,7 @@ void add_to_uhash(int n, char *id);
 int setumoney(int uid, int money);
 int getbtotal(int bid);
 userinfo_t *search_ulist_pid(int pid);
-userinfo_t *search_ulist_userid(int userid);
+userinfo_t *search_ulist_userid(char *userid);
 int moneyof(int uid);
 void hbflreload(int bid);
 int hbflcheck(int bid, int uid);
diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c
index c8bfec24..688bd0c9 100644
--- a/mbbsd/mbbsd.c
+++ b/mbbsd/mbbsd.c
@@ -1,4 +1,4 @@
-/* $Id: mbbsd.c,v 1.80 2003/05/20 02:01:09 bbs Exp $ */
+/* $Id: mbbsd.c,v 1.81 2003/05/20 02:03:35 bbs Exp $ */
 #include "bbs.h"
 
 #define SOCKET_QLEN 4
@@ -916,18 +916,10 @@ do_aloha(char *hello)
 	    userinfo_t     *uentp;
 	    int             tuid;
 
-#if 1
 	    if ((uentp = (userinfo_t *) search_ulist_userid(userid)) && 
 		    isvisible(uentp, currutmp)) {
 		my_write(uentp->pid, genbuf, uentp->userid, 2, NULL);
 	    }
-#else
-	    if ((tuid = searchuser(userid)) && tuid != usernum &&
-		(uentp = (userinfo_t *) search_ulist(tuid)) &&
-		isvisible(uentp, currutmp)) {
-		my_write(uentp->pid, genbuf, uentp->userid, 2, NULL);
-	    }
-#endif
 	}
 	fclose(fp);
     }
-- 
cgit v1.2.3