set sorted_way to 7 (by pid) in [嗨! 朋友] mode.

or show nobody in the userlist when there are very few online users.


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

1 files changed, 2 insertions, 6 deletions

diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 740b5936..0d0dc6fa 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -1885,18 +1885,14 @@ pickup(pickup_t * currpickup, int pickup_way, int *page,
 	*nfriend = 0;
 
     if (!(cuser.uflag & FRIEND_FLAG) && size < nPickups) {
-	sorted_way = ((pickup_way == 0) ? 0 : (pickup_way - 1));
+	sorted_way = ((pickup_way == 0) ? 7 : (pickup_way - 1));
 	ulist = SHM->sorted[currsorted][sorted_way];
 	which = *page * nPickups - *nfriend;
 	if (which < 0)
 	    which = 0;
 
 	for (; which < utmpnumber && size < nPickups; which++) {
-
-           if (pickup_way == 0)          /* [��! �B��] mode */
-               u = &SHM->uinfo[which]; /* ���ǤH�Φ����s�i�A�ҥH���Asort */
-           else
-               u = &SHM->uinfo[ulist[which]];
+	    u = &SHM->uinfo[ulist[which]];
 
 	    friend = friend_stat(currutmp, u);
 	    /* TODO isvisible() ���ƥΨ�F friend_stat() */