From f0ab98cd964359bb40f749c0202a74fead9b0799 Mon Sep 17 00:00:00 2001 From: zhouhuang Date: Tue, 10 Dec 2024 10:24:17 +0800 Subject: [PATCH] update --- das-dn/cmg/ry.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/das-dn/cmg/ry.cpp b/das-dn/cmg/ry.cpp index 4cc96be6..5efbec3f 100644 --- a/das-dn/cmg/ry.cpp +++ b/das-dn/cmg/ry.cpp @@ -450,10 +450,11 @@ BOOLEAN CRYDevice::GetUnitYCIsForceArchive(int uid, int order) const int udb; struUnit* pUnit; struUnitYC* pYC; - if (uid < 0 || uid >= UNIT_NUM) return 0; + if (uid < 0 || uid >= UNIT_NUM) return FALSE; pUnit = &config.units[uid]; - if ((pUnit->state & 0x01) != TRUE) return 0; - if (order < 0 || order >= pUnit->yccount) return 0; + if ((pUnit->state & 0x01) != TRUE) return FALSE; + if ((pUnit->state & 0x20) == 0x20) return TRUE; + if (order < 0 || order >= pUnit->yccount) return FALSE; pYC = &pUnit->ycs[order]; udb = pYC->order; if (udb < 0 || udb >= DATABASE_YC_NUM) @@ -468,10 +469,11 @@ BOOLEAN CRYDevice::GetUnitYXIsForceArchive(int uid, int order) const int udb; struUnit* pUnit; struUnitYX* pYX; - if (uid < 0 || uid >= UNIT_NUM) return 0; + if (uid < 0 || uid >= UNIT_NUM) return FALSE; pUnit = &config.units[uid]; - if ((pUnit->state & 0x01) != TRUE) return 0; - if (order < 0 || order >= pUnit->yxcount) return 0; + if ((pUnit->state & 0x01) != TRUE) return FALSE; + if ((pUnit->state & 0x20) == 0x20) return TRUE; + if (order < 0 || order >= pUnit->yxcount) return FALSE; pYX = &pUnit->yxs[order]; udb = pYX->order; if (udb < 0 || udb >= DATABASE_YX_NUM)