summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2002-06-05 11:22:43 +0800
committerptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2002-06-05 11:22:43 +0800
commitc0a6419aeceaeb93d5d9ccde393236d67ff8c72f (patch)
tree0c08370fad597017a24145bc8db170654d9b8787
parent34950cf9e1557ed9959a6b3a88c5b18bf68db0a3 (diff)
downloadpttbbs-c0a6419aeceaeb93d5d9ccde393236d67ff8c72f.tar
pttbbs-c0a6419aeceaeb93d5d9ccde393236d67ff8c72f.tar.gz
pttbbs-c0a6419aeceaeb93d5d9ccde393236d67ff8c72f.tar.bz2
pttbbs-c0a6419aeceaeb93d5d9ccde393236d67ff8c72f.tar.lz
pttbbs-c0a6419aeceaeb93d5d9ccde393236d67ff8c72f.tar.xz
pttbbs-c0a6419aeceaeb93d5d9ccde393236d67ff8c72f.tar.zst
pttbbs-c0a6419aeceaeb93d5d9ccde393236d67ff8c72f.zip
*** empty log message ***
git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@295 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--mbbsd/talk.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 3e078ef4..e1feac1f 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -1,4 +1,4 @@
-/* $Id: talk.c,v 1.67 2002/06/05 02:42:29 ptt Exp $ */
+/* $Id: talk.c,v 1.68 2002/06/05 03:22:43 ptt Exp $ */
#include "bbs.h"
#define QCAST int (*)(const void *, const void *)
@@ -1529,7 +1529,7 @@ static void pickup(pickup_t *currpickup, int pickup_way, int *page,
int friendtotal= currutmp->friendtotal;
userinfo_t **utmp;
- int which, sorted_way, size=0;
+ int which, sorted_way, size=0, friend;
if( friendtotal == 0 )
*myfriend = *friendme = 1;
@@ -1569,12 +1569,13 @@ static void pickup(pickup_t *currpickup, int pickup_way, int *page,
if(which<0) which=0;
for(;which < utmpnumber && size < MAXPICKUP;which++)
{
+ friend = friend_stat(currutmp,utmp[which]);
if((pickup_way||(currutmp != utmp[which] &&
- !(friend_stat(currutmp,utmp[which])&ST_FRIEND))) &&
+ !(friend&ST_FRIEND))) &&
isvisible_stat(currutmp, utmp[which], 0))
{
currpickup[size].ui = utmp[which];
- currpickup[size++].friend = 0;
+ currpickup[size++].friend = friend;
}
}
}