Чтобы CAnomalyDetector не пытался обрабатывать отключенные аномалии

xrSimpodin · xrSimpodin · commit 236a01bc1604 · 2024-07-03T15:56:10.000+03:00
diff --git a/ogsr_engine/COMMON_AI/xrMessages.h b/ogsr_engine/COMMON_AI/xrMessages.h
@@ -68,8 +68,6 @@ enum
 
     GE_GRENADE_EXPLODE,
 
-    GE_ZONE_STATE_CHANGE,
-
     GE_CHANGE_POS,
 
     GE_CHANGE_VISUAL,
diff --git a/ogsr_engine/xrGame/CustomZone.cpp b/ogsr_engine/xrGame/CustomZone.cpp
@@ -1194,12 +1194,6 @@ void CCustomZone::OnEvent(NET_Packet& P, u16 type)
 {
     switch (type)
     {
-    case GE_ZONE_STATE_CHANGE: {
-        u8 S;
-        P.r_u8(S);
-        OnStateSwitch(EZoneState(S));
-        break;
-    }
     case GE_OWNERSHIP_TAKE: {
         u16 id;
         P.r_u16(id);
@@ -1265,13 +1259,7 @@ void CCustomZone::OnStateSwitch(EZoneState new_state)
 
 void CCustomZone::SwitchZoneState(EZoneState new_state)
 {
-    {
-        // !!! Just single entry for given state !!!
-        NET_Packet P;
-        u_EventGen(P, GE_ZONE_STATE_CHANGE, ID());
-        P.w_u8(u8(new_state));
-        u_EventSend(P);
-    };
+    OnStateSwitch(new_state);
 
     m_iPreviousStateTime = m_iStateTime = 0;
 }
@@ -1603,10 +1591,7 @@ void CCustomZone::UpdateOnOffState()
 void CCustomZone::GoDisabledState()
 {
     // switch to disable
-    NET_Packet P;
-    u_EventGen(P, GE_ZONE_STATE_CHANGE, ID());
-    P.w_u8(u8(eZoneStateDisabled));
-    u_EventSend(P);
+    OnStateSwitch(eZoneStateDisabled);
 
     OBJECT_INFO_VEC_IT it = m_ObjectInfoMap.begin();
     OBJECT_INFO_VEC_IT it_e = m_ObjectInfoMap.end();
@@ -1621,10 +1606,7 @@ void CCustomZone::GoDisabledState()
 void CCustomZone::GoEnabledState()
 {
     // switch to idle
-    NET_Packet P;
-    u_EventGen(P, GE_ZONE_STATE_CHANGE, ID());
-    P.w_u8(u8(eZoneStateIdle));
-    u_EventSend(P);
+    OnStateSwitch(eZoneStateIdle);
 }
 
 BOOL CCustomZone::feel_touch_on_contact(CObject* O)
diff --git a/ogsr_engine/xrGame/ai/monsters/anomaly_detector.cpp b/ogsr_engine/xrGame/ai/monsters/anomaly_detector.cpp
@@ -97,9 +97,16 @@ BOOL CAnomalyDetector::feel_touch_contact(CObject* obj)
 
 void CAnomalyDetector::on_contact(CObject* obj)
 {
+    if (obj->getDestroy())
+        return;
+
     auto custom_zone = smart_cast<CCustomZone*>(obj);
+
     ASSERT_FMT(custom_zone, "[%s]: %s not a CCUstomZone", __FUNCTION__, obj->cName().c_str());
 
+    if (custom_zone->ZoneState() == CCustomZone::eZoneStateDisabled)
+        return;
+
     auto it = std::find_if(m_storage.begin(), m_storage.end(), [custom_zone](const auto& it) { return it.id == custom_zone->ID(); });
     if (it != m_storage.end())
     {
diff --git a/ogsr_engine/xrGame/xrServer_process_event.cpp b/ogsr_engine/xrGame/xrServer_process_event.cpp
@@ -46,7 +46,6 @@ void xrServer::Process_event(NET_Packet& P, ClientID sender)
     {
     case GE_INFO_TRANSFER:
     case GE_WPN_STATE_CHANGE:
-    case GE_ZONE_STATE_CHANGE:
     case GEG_PLAYER_ATTACH_HOLDER:
     case GEG_PLAYER_DETACH_HOLDER:
     case GEG_PLAYER_ACTIVATEARTEFACT:

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ void xrServer::Process_event(NET_Packet& P, ClientID sender)`
`46`	`46`	`{`
`47`	`47`	`case GE_INFO_TRANSFER:`
`48`	`48`	`case GE_WPN_STATE_CHANGE:`
`49`		`- case GE_ZONE_STATE_CHANGE:`
`50`	`49`	`case GEG_PLAYER_ATTACH_HOLDER:`
`51`	`50`	`case GEG_PLAYER_DETACH_HOLDER:`
`52`	`51`	`case GEG_PLAYER_ACTIVATEARTEFACT:`