diff options
| author | ptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-05-27 23:51:49 +0800 |
|---|---|---|
| committer | ptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-05-27 23:51:49 +0800 |
| commit | ea094c6eb7b24edecde4e20b0931f24add4b2f31 (patch) | |
| tree | 691133b1d1a5d0827a86a0cb5fdffdbf23496f67 | |
| parent | f3369b3b2ea3e15d6fc1229586192053ee3a3bcb (diff) | |
| download | pttbbs-ea094c6eb7b24edecde4e20b0931f24add4b2f31.tar pttbbs-ea094c6eb7b24edecde4e20b0931f24add4b2f31.tar.gz pttbbs-ea094c6eb7b24edecde4e20b0931f24add4b2f31.tar.bz2 pttbbs-ea094c6eb7b24edecde4e20b0931f24add4b2f31.tar.lz pttbbs-ea094c6eb7b24edecde4e20b0931f24add4b2f31.tar.xz pttbbs-ea094c6eb7b24edecde4e20b0931f24add4b2f31.tar.zst pttbbs-ea094c6eb7b24edecde4e20b0931f24add4b2f31.zip | |
1. send etc/foreign_expired_warn only when FOREIGN_REG_DAY > 0 for Ptt3
2. fix build break from Angel
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2027 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | mbbsd/mbbsd.c | 2 | ||||
| -rw-r--r-- | mbbsd/talk.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c index 529f0931..30d8e1b4 100644 --- a/mbbsd/mbbsd.c +++ b/mbbsd/mbbsd.c @@ -861,7 +861,7 @@ static void init_guest_info(void) currutmp->pager = 2; } -#ifdef FOREIGN_REG_DAY +#ifdef FOREIGN_REG_DAY > 0 inline static void foreign_warning(void){ if ((cuser.uflag2 & FOREIGN) && !(cuser.uflag2 & LIVERIGHT)){ if (login_start_time - cuser.firstlogin > (FOREIGN_REG_DAY - 5) * 24 * 3600){ diff --git a/mbbsd/talk.c b/mbbsd/talk.c index ab09c46a..f5b1bfb6 100644 --- a/mbbsd/talk.c +++ b/mbbsd/talk.c @@ -635,7 +635,10 @@ my_write(pid_t pid, char *prompt, char *id, int flag, userinfo_t * puin) strlcpy(destid, id, sizeof(destid)); if (!uin && !((flag == WATERBALL_GENERAL - || flag == WATERBALL_ANGEL || flag == WATERBALL_ANSWER) +#ifdef PLAY_ANGEL + || flag == WATERBALL_ANGEL || flag == WATERBALL_ANSWER +#endif + ) && water_which->count > 0)) { vmsg("糟糕! 對方已落跑了(不在站上)! "); watermode = -1; |