diff options
| author | ptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2002-06-05 09:50:40 +0800 |
|---|---|---|
| committer | ptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2002-06-05 09:50:40 +0800 |
| commit | 5b0f7364cb66e97eb10fa7b6bdf903608f8e7499 (patch) | |
| tree | ff4dcdc380fe382a27323f33d72bfc38ca0a0654 /mbbsd | |
| parent | 9e8eccb1ed95c357fc4291d06d8fb29ea92a37c5 (diff) | |
| download | pttbbs-5b0f7364cb66e97eb10fa7b6bdf903608f8e7499.tar pttbbs-5b0f7364cb66e97eb10fa7b6bdf903608f8e7499.tar.gz pttbbs-5b0f7364cb66e97eb10fa7b6bdf903608f8e7499.tar.bz2 pttbbs-5b0f7364cb66e97eb10fa7b6bdf903608f8e7499.tar.lz pttbbs-5b0f7364cb66e97eb10fa7b6bdf903608f8e7499.tar.xz pttbbs-5b0f7364cb66e97eb10fa7b6bdf903608f8e7499.tar.zst pttbbs-5b0f7364cb66e97eb10fa7b6bdf903608f8e7499.zip | |
*** empty log message ***
git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@287 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd')
| -rw-r--r-- | mbbsd/talk.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mbbsd/talk.c b/mbbsd/talk.c index 4f54254d..64a85d34 100644 --- a/mbbsd/talk.c +++ b/mbbsd/talk.c @@ -1,4 +1,4 @@ -/* $Id: talk.c,v 1.63 2002/06/04 18:54:41 ptt Exp $ */ +/* $Id: talk.c,v 1.64 2002/06/05 01:50:40 ptt Exp $ */ #include "bbs.h" #define QCAST int (*)(const void *, const void *) @@ -1492,7 +1492,6 @@ static int pickup_myfriend(pickup_t *friends, ){ friends[ngets].ui = uentp; friends[ngets].uoffset = where; - if(uentp->brc_id==currutmp->brc_id) frstate |= IBH; friends[ngets++].friend = frstate; if( frstate & IFH ) ++*myfriend; @@ -1514,7 +1513,7 @@ static int pickup_bfriend(pickup_t *friends, int base) ptr != NULL && ngets < MAX_FRIEND-base ; ptr = ptr->nextbfriend ){ if( currutmp != ptr && isvisible(currutmp, ptr) && - !(friend_stat(currutmp,ptr)&(IFH|HFM)) ){ + (base || !(friend_stat(currutmp,ptr)&(IFH|HFM))) ){ friends[ngets].ui = ptr; friends[ngets++].friend = IBH; } @@ -1571,7 +1570,7 @@ static void pickup(pickup_t *currpickup, int pickup_way, int *page, for(;which < utmpnumber && size < MAXPICKUP;which++) { if(currutmp != utmp[which] && - !(friend_stat(currutmp,utmp[which])&ST_FRIEND) && + (pickup_way||!(friend_stat(currutmp,utmp[which])&ST_FRIEND)) && isvisible_stat(currutmp, utmp[which], 0)) { currpickup[size].ui = utmp[which]; |