File tree Expand file tree Collapse file tree 2 files changed +19
-7
lines changed Expand file tree Collapse file tree 2 files changed +19
-7
lines changed Original file line number Diff line number Diff line change @@ -1069,7 +1069,7 @@ bool CWorldSA::IsRemovedModelInRadius(SIPLInst* pInst)
1069
1069
1070
1070
float fDistance = sqrt (fDistanceX * fDistanceX + fDistanceY * fDistanceY + fDistanceZ * fDistanceZ );
1071
1071
// is it in the removal spheres radius if so return else keep looking
1072
- if (fDistance <= pFind->m_fRadius && (pFind->m_cInterior == -1 || pFind->m_cInterior == pInst->m_nInterior ))
1072
+ if (fDistance <= pFind->m_fRadius && (pFind->m_cInterior == -1 || pFind->m_cInterior == pInst->m_nAreaCode ))
1073
1073
{
1074
1074
return true ;
1075
1075
}
Original file line number Diff line number Diff line change @@ -95,15 +95,27 @@ struct SBuildingRemoval
95
95
std::list<CEntitySAInterface*>* m_pBinaryRemoveList;
96
96
std::list<CEntitySAInterface*>* m_pDataRemoveList;
97
97
};
98
+
98
99
struct SIPLInst
99
100
{
100
- CVector m_pPosition;
101
- CVector m_pRotation;
102
- float m_fRotationCont;
103
- WORD m_nModelIndex;
104
- BYTE m_nInterior;
105
- BYTE m_bLOD;
101
+ CVector m_pPosition;
102
+ CVector4D m_pRotation;
103
+ int32_t m_nModelIndex;
104
+ union {
105
+ struct {
106
+ uint32_t m_nAreaCode : 8 ;
107
+ uint32_t m_bRedundantStream : 1 ;
108
+ uint32_t m_bDontStream : 1 ;
109
+ uint32_t m_bUnderwater : 1 ;
110
+ uint32_t m_bTunnel : 1 ;
111
+ uint32_t m_bTunnelTransition : 1 ;
112
+ uint32_t m_nReserved : 19 ;
113
+ };
114
+ uint32_t m_nInstanceType;
115
+ };
116
+ int32_t m_nLodInstanceIndex;
106
117
};
118
+ static_assert (sizeof (SIPLInst) == 0x28, "Invalid sizeof(SIPLInst)");
107
119
108
120
struct sDataBuildingRemovalItem
109
121
{
You can’t perform that action at this time.
0 commit comments