Skip to content

Fixes #551 - onMarkerHit on attached elements #4571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 23, 2025
Merged

Fixes #551 - onMarkerHit on attached elements #4571

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8ac838
Enhance marker handling on element attachment and detachment
MohabCodeX Nov 23, 2025
5bc3129
Merge branch 'master' into fix/marker-hit-on-attached-elements
MohabCodeX Nov 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1628,6 +1628,18 @@ bool CStaticFunctionDefinitions::AttachElements(CElement* pElement, CElement* pA
pElement->SetAttachedOffsets(vecPosition, vecRotation);
pElement->AttachTo(pAttachedToElement);

if (IS_MARKER(pElement))
{
CMarker* pMarker = static_cast<CMarker*>(pElement);
CVector attachedPosition;
pMarker->GetAttachedPosition(attachedPosition);
pMarker->SetPosition(attachedPosition);

CColShape* pColShape = pMarker->GetColShape();
if (pColShape)
RefreshColShapeColliders(pColShape);
}

CBitStream BitStream;
BitStream.pBitStream->Write(pAttachedToElement->GetID());
BitStream.pBitStream->Write(vecPosition.fX);
Expand Down Expand Up @@ -1676,6 +1688,14 @@ bool CStaticFunctionDefinitions::DetachElements(CElement* pElement, CElement* pA
pElement->AttachTo(NULL);
pElement->GenerateSyncTimeContext();

if (IS_MARKER(pElement))
{
CMarker* pMarker = static_cast<CMarker*>(pElement);
CColShape* pColShape = pMarker->GetColShape();
if (pColShape)
RefreshColShapeColliders(pColShape);
}

CBitStream BitStream;
BitStream.pBitStream->Write(pElement->GetSyncTimeContext());
BitStream.pBitStream->Write(vecPosition.fX);
Expand Down