From de4dffc2d1ac1d3336e1a1d0501b82288fbf60e7 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sun, 4 Dec 2011 13:18:52 +0000
Subject: support friend+reject (super friend) for angels

git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5490 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 pttbbs/mbbsd/angel.c | 4 +++-
 pttbbs/mbbsd/talk.c  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pttbbs/mbbsd/angel.c b/pttbbs/mbbsd/angel.c
index c0f46e48..6d7e7cf6 100644
--- a/pttbbs/mbbsd/angel.c
+++ b/pttbbs/mbbsd/angel.c
@@ -353,11 +353,13 @@ int a_angelreload() {
 
 inline int
 angel_reject_me(userinfo_t * uin){
-    // TODO 超級好友怎麼辦？
     int* iter = uin->reject;
     int unum;
     while ((unum = *iter++)) {
 	if (unum == currutmp->uid) {
+            // 超級好友?
+            if (intbsearch(unum, uin->myfriend, uin->nFriends))
+                return 0;
 	    return 1;
 	}
     }
diff --git a/pttbbs/mbbsd/talk.c b/pttbbs/mbbsd/talk.c
index 79d9edff..9736571a 100644
--- a/pttbbs/mbbsd/talk.c
+++ b/pttbbs/mbbsd/talk.c
@@ -2630,7 +2630,7 @@ userlist(void)
 		    redrawall = redraw = 1;
 		}
 		break;
-#endif // PLAY_ANGLE
+#endif // PLAY_ANGEL
 
 	    case Ctrl('W'):
 		if (HasBasicUserPerm(PERM_LOGINOK)) {
-- 
cgit v1.2.3