diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2013-03-21 22:38:35 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2013-03-21 22:38:35 +0800 |
| commit | 8b42fba13e13c61edbc9b80327f33aecd90d66ea (patch) | |
| tree | 94c09887b5a8b0c29b27a714893965d5d551a14d | |
| parent | 94fa92d230e3b878fd11f3709ae055634636735e (diff) | |
| download | pttbbs-8b42fba13e13c61edbc9b80327f33aecd90d66ea.tar pttbbs-8b42fba13e13c61edbc9b80327f33aecd90d66ea.tar.gz pttbbs-8b42fba13e13c61edbc9b80327f33aecd90d66ea.tar.bz2 pttbbs-8b42fba13e13c61edbc9b80327f33aecd90d66ea.tar.lz pttbbs-8b42fba13e13c61edbc9b80327f33aecd90d66ea.tar.xz pttbbs-8b42fba13e13c61edbc9b80327f33aecd90d66ea.tar.zst pttbbs-8b42fba13e13c61edbc9b80327f33aecd90d66ea.zip | |
The new "probation rule" works pretty good for angel assignment, so let's remove
the alert.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5814 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | pttbbs/daemon/angelbeats/angelbeats.c | 6 | ||||
| -rw-r--r-- | pttbbs/mbbsd/angel.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pttbbs/daemon/angelbeats/angelbeats.c b/pttbbs/daemon/angelbeats/angelbeats.c index d902df1b..9bd38b77 100644 --- a/pttbbs/daemon/angelbeats/angelbeats.c +++ b/pttbbs/daemon/angelbeats/angelbeats.c @@ -311,10 +311,12 @@ suggest_online_angel(int master_uid) { continue; #ifdef TRACE_ANGEL_SELECTION - log("\n %d.%*s(masters=%d,act=%d,assigned=%d) ", ++found, IDLEN, + log("\n %d.%*s(masters=%d,act=%d,assigned=%d%s) ", ++found, IDLEN, kanade->userid, kanade->masters, (int)(clk - kanade->last_activity), - (int)(clk - kanade->last_assigned)); + (int)(clk - kanade->last_assigned), + ((int)(clk - kanade->last_assigned) < + ANGELBEATS_ASSIGN_PROBATION_PERIOD) ? "[probation]" : ""); #endif #if defined(ANGELBEATS_ASSIGN_BY_LAST_ACTIVITY) diff --git a/pttbbs/mbbsd/angel.c b/pttbbs/mbbsd/angel.c index 730e18a5..a68f6197 100644 --- a/pttbbs/mbbsd/angel.c +++ b/pttbbs/mbbsd/angel.c @@ -358,8 +358,6 @@ do_changeangel(int force) { return 0; } - mvouts(b_lines - 3, 0, "\n" - "請注意若未呼叫過目前的小天使就申請更換，很可能會再換到同個天使\n"); getdata(b_lines - 1, 0, "確定要更換小天使？ [y/N]", buf, 3, LCECHO); if (buf[0] == 'y') { log_filef(BBSHOME "/log/changeangel.log",LOG_CREAT, |