summaryrefslogtreecommitdiffstats
path: root/mbbsd
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2008-03-06 20:33:34 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2008-03-06 20:33:34 +0800
commite2edcb13a0eb21598f99ecc7a4e2627aa1c79bae (patch)
tree5d18e80d1e50cab54a387f1afb57dd432131429c /mbbsd
parenta1d171bf72cc949f8852258cf36016cbc70d98b9 (diff)
downloadpttbbs-e2edcb13a0eb21598f99ecc7a4e2627aa1c79bae.tar
pttbbs-e2edcb13a0eb21598f99ecc7a4e2627aa1c79bae.tar.gz
pttbbs-e2edcb13a0eb21598f99ecc7a4e2627aa1c79bae.tar.bz2
pttbbs-e2edcb13a0eb21598f99ecc7a4e2627aa1c79bae.tar.lz
pttbbs-e2edcb13a0eb21598f99ecc7a4e2627aa1c79bae.tar.xz
pttbbs-e2edcb13a0eb21598f99ecc7a4e2627aa1c79bae.tar.zst
pttbbs-e2edcb13a0eb21598f99ecc7a4e2627aa1c79bae.zip
- chicken: enable PK with new mmap style
- userec_t: comments for deprecated chicken data git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3969 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd')
-rw-r--r--mbbsd/talk.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 751fb897..138dde54 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -1761,14 +1761,16 @@ my_talk(userinfo_t * uin, int fri_stat, char defact)
case 'p':
{
userec_t xuser;
+ chicken_t xchk;
int error = 0;
- reload_chicken();
getuser(uin->userid, &xuser);
if (uin->lockmode == CHICKEN || currutmp->lockmode == CHICKEN)
error = 1;
- if (!cuser.mychicken.name[0] || !xuser.mychicken.name[0])
+ else if (!load_chicken(cuser.userid, &xchk) ||
+ !load_chicken(xuser.userid, &xchk))
error = 2;
+
if (error) {
vmsg(error == 2 ? "並非兩人都養寵物" :
"有一方的寵物正在使用中");