Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5cb2f3d

Browse files
authored
Revert "Fix stack overflow when attaching elements in maps (#1663)"
This reverts commit 97dbfc6.
1 parent 7709c2d commit 5cb2f3d

File tree

8 files changed

+32
-54
lines changed

8 files changed

+32
-54
lines changed

‎Client/mods/deathmatch/logic/CClientEntity.cpp‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,27 +1070,6 @@ bool CClientEntity::IsEntityAttached(CClientEntity* pEntity)
10701070
return ListContains(m_AttachedEntities, pEntity);
10711071
}
10721072

1073-
bool CClientEntity::IsAttachedToElement(CClientEntity* pEntity, bool bRecursive)
1074-
{
1075-
if (bRecursive)
1076-
{
1077-
std::set<CClientEntity*> history;
1078-
1079-
for (CClientEntity* pCurrent = this; pCurrent; pCurrent = pCurrent->GetAttachedTo())
1080-
{
1081-
if (pCurrent == pEntity)
1082-
return true;
1083-
1084-
if (!std::get<bool>(history.insert(pCurrent)))
1085-
break; // This should not be possible, but you never know
1086-
}
1087-
1088-
return false;
1089-
}
1090-
1091-
return m_pAttachedToEntity == pEntity;
1092-
}
1093-
10941073
void CClientEntity::ReattachEntities()
10951074
{
10961075
// Jax: this should be called on streamIn/creation

‎Client/mods/deathmatch/logic/CClientEntity.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ class CClientEntity : public CClientEntityBase
233233
virtual void GetAttachedOffsets(CVector& vecPosition, CVector& vecRotation);
234234
virtual void SetAttachedOffsets(CVector& vecPosition, CVector& vecRotation);
235235
bool IsEntityAttached(CClientEntity* pEntity);
236-
bool IsAttachedToElement(CClientEntity* pEntity, bool bRecursive = true);
237236
uint GetAttachedEntityCount() { return m_AttachedEntities.size(); }
238237
CClientEntity* GetAttachedEntity(uint uiIndex) { return m_AttachedEntities[uiIndex]; }
239238
void ReattachEntities();

‎Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1317,8 +1317,19 @@ bool CStaticFunctionDefinitions::AttachElements(CClientEntity& Entity, CClientEn
13171317
{
13181318
RUN_CHILDREN(AttachElements(**iter, AttachedToEntity, vecPosition, vecRotation))
13191319

1320+
// Check the elements we are attaching are not already connected
1321+
std::set<CClientEntity*> history;
1322+
for (CClientEntity* pCurrent = &AttachedToEntity; pCurrent; pCurrent = pCurrent->GetAttachedTo())
1323+
{
1324+
if (pCurrent == &Entity)
1325+
return false;
1326+
if (MapContains(history, pCurrent))
1327+
break; // This should not be possible, but you never know
1328+
MapInsert(history, pCurrent);
1329+
}
1330+
13201331
// Can these elements be attached?
1321-
if (Entity.IsAttachToable() && AttachedToEntity.IsAttachable() && !AttachedToEntity.IsAttachedToElement(&Entity) && Entity.GetDimension() == AttachedToEntity.GetDimension())
1332+
if (Entity.IsAttachToable() && AttachedToEntity.IsAttachable() && Entity.GetDimension() == AttachedToEntity.GetDimension())
13221333
{
13231334
ConvertDegreesToRadians(vecRotation);
13241335

‎Server/mods/deathmatch/logic/CElement.cpp‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,27 +1126,6 @@ bool CElement::IsElementAttached(CElement* pElement)
11261126
return false;
11271127
}
11281128

1129-
bool CElement::IsAttachedToElement(CElement* pElement, bool bRecursive)
1130-
{
1131-
if (bRecursive)
1132-
{
1133-
std::set<CElement*> history;
1134-
1135-
for (CElement* pCurrent = this; pCurrent; pCurrent = pCurrent->GetAttachedToElement())
1136-
{
1137-
if (pCurrent == pElement)
1138-
return true;
1139-
1140-
if (!std::get<bool>(history.insert(pCurrent)))
1141-
break; // This should not be possible, but you never know
1142-
}
1143-
1144-
return false;
1145-
}
1146-
1147-
return m_pAttachedTo == pElement;
1148-
}
1149-
11501129
bool CElement::IsAttachable()
11511130
{
11521131
switch (GetType())

‎Server/mods/deathmatch/logic/CElement.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ class CElement
195195
std::list<CElement*>::const_iterator AttachedElementsEnd() { return m_AttachedElements.end(); }
196196
const char* GetAttachToID() { return m_strAttachToID; }
197197
bool IsElementAttached(CElement* pElement);
198-
bool IsAttachedToElement(CElement* pElement, bool bRecursive = true);
199198
virtual bool IsAttachable();
200199
virtual bool IsAttachToable();
201200
void GetAttachedPosition(CVector& vecPosition);

‎Server/mods/deathmatch/logic/CMapManager.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ void CMapManager::LinkupElements()
954954
{
955955
CElement* pElement = g_pGame->GetMapManager()->GetRootElement()->FindChild(szAttachToID, 0, true);
956956

957-
if (pElement && !pElement->IsAttachedToElement(vehicle))
957+
if (pElement)
958958
vehicle->AttachTo(pElement);
959959
}
960960
}
@@ -968,7 +968,7 @@ void CMapManager::LinkupElements()
968968
if (szAttachToID[0])
969969
{
970970
CElement* pElement = g_pGame->GetMapManager()->GetRootElement()->FindChild(szAttachToID, 0, true);
971-
if (pElement && !pElement->IsAttachedToElement(pPlayer))
971+
if (pElement)
972972
pPlayer->AttachTo(pElement);
973973
}
974974
}
@@ -982,7 +982,7 @@ void CMapManager::LinkupElements()
982982
if (szAttachToID[0])
983983
{
984984
CElement* pElement = g_pGame->GetMapManager()->GetRootElement()->FindChild(szAttachToID, 0, true);
985-
if (pElement && !pElement->IsAttachedToElement(pObject))
985+
if (pElement)
986986
pObject->AttachTo(pElement);
987987
}
988988
}
@@ -996,7 +996,7 @@ void CMapManager::LinkupElements()
996996
if (szAttachToID[0])
997997
{
998998
CElement* pElement = g_pGame->GetMapManager()->GetRootElement()->FindChild(szAttachToID, 0, true);
999-
if (pElement && !pElement->IsAttachedToElement(pBlip))
999+
if (pElement)
10001000
pBlip->AttachTo(pElement);
10011001
}
10021002
}

‎Server/mods/deathmatch/logic/CResourceMapItem.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ void CResourceMapItem::LinkupElements()
207207
{
208208
CElement* const pElement = pRootElement->FindChild(szAttachToID, 0, true);
209209

210-
if (pElement && !pElement->IsAttachedToElement(vehicle))
210+
if (pElement)
211211
vehicle->AttachTo(pElement);
212212
}
213213
}
@@ -221,7 +221,7 @@ void CResourceMapItem::LinkupElements()
221221
{
222222
CElement* const pElement = pRootElement->FindChild(szAttachToID, 0, true);
223223

224-
if (pElement && !pElement->IsAttachedToElement(pPlayer))
224+
if (pElement)
225225
pPlayer->AttachTo(pElement);
226226
}
227227
}
@@ -235,7 +235,7 @@ void CResourceMapItem::LinkupElements()
235235
{
236236
CElement* const pElement = pRootElement->FindChild(szAttachToID, 0, true);
237237

238-
if (pElement && !pElement->IsAttachedToElement(pObject))
238+
if (pElement)
239239
pObject->AttachTo(pElement);
240240
}
241241
}
@@ -249,7 +249,7 @@ void CResourceMapItem::LinkupElements()
249249
{
250250
CElement* const pElement = pRootElement->FindChild(szAttachToID, 0, true);
251251

252-
if (pElement && !pElement->IsAttachedToElement(pBlip))
252+
if (pElement)
253253
pBlip->AttachTo(pElement);
254254
}
255255
}

‎Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1453,7 +1453,18 @@ bool CStaticFunctionDefinitions::AttachElements(CElement* pElement, CElement* pA
14531453
assert(pElement);
14541454
assert(pAttachedToElement);
14551455

1456-
if (pElement->IsAttachToable() && pAttachedToElement->IsAttachable() && !pAttachedToElement->IsAttachedToElement(pElement) && pElement->GetDimension() == pAttachedToElement->GetDimension())
1456+
// Check the elements we are attaching are not already connected
1457+
std::set<CElement*> history;
1458+
for (CElement* pCurrent = pAttachedToElement; pCurrent; pCurrent = pCurrent->GetAttachedToElement())
1459+
{
1460+
if (pCurrent == pElement)
1461+
return false;
1462+
if (MapContains(history, pCurrent))
1463+
break; // This should not be possible, but you never know
1464+
MapInsert(history, pCurrent);
1465+
}
1466+
1467+
if (pElement->IsAttachToable() && pAttachedToElement->IsAttachable() && pElement->GetDimension() == pAttachedToElement->GetDimension())
14571468
{
14581469
pElement->SetAttachedOffsets(vecPosition, vecRotation);
14591470
ConvertDegreesToRadians(vecRotation);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /