Skip to content

Colshape IDs fix #4115

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
Mar 28, 2025
Merged

Colshape IDs fix #4115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a459d56
Colshape IDs fix
tederis Mar 21, 2025
e9698dd
Merge branch 'master' into colshape_ids_fix
tederis Mar 26, 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
10 changes: 5 additions & 5 deletions Client/mods/deathmatch/logic/CClientMarker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ void CClientMarker::CreateOfType(int iType)
CClientCheckpoint* pCheckpoint = new CClientCheckpoint(this);
pCheckpoint->SetCheckpointType(CClientCheckpoint::TYPE_NORMAL);
m_pMarker = pCheckpoint;
m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
m_pCollision->m_pOwningMarker = this;
m_pCollision->SetHitCallback(this);
break;
Expand All @@ -458,7 +458,7 @@ void CClientMarker::CreateOfType(int iType)
CClientCheckpoint* pCheckpoint = new CClientCheckpoint(this);
pCheckpoint->SetCheckpointType(CClientCheckpoint::TYPE_RING);
m_pMarker = pCheckpoint;
m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
m_pCollision->m_pOwningMarker = this;
m_pCollision->SetHitCallback(this);
break;
Expand All @@ -469,7 +469,7 @@ void CClientMarker::CreateOfType(int iType)
CClient3DMarker* p3DMarker = new CClient3DMarker(this);
p3DMarker->Set3DMarkerType(CClient3DMarker::TYPE_CYLINDER);
m_pMarker = p3DMarker;
m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
m_pCollision->m_pOwningMarker = this;
m_pCollision->SetHitCallback(this);
break;
Expand All @@ -480,7 +480,7 @@ void CClientMarker::CreateOfType(int iType)
CClient3DMarker* p3DMarker = new CClient3DMarker(this);
p3DMarker->Set3DMarkerType(CClient3DMarker::TYPE_ARROW);
m_pMarker = p3DMarker;
m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
m_pCollision->m_pOwningMarker = this;
m_pCollision->SetHitCallback(this);
break;
Expand All @@ -489,7 +489,7 @@ void CClientMarker::CreateOfType(int iType)
case MARKER_CORONA:
{
m_pMarker = new CClientCorona(this);
m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
m_pCollision->m_pOwningMarker = this;
m_pCollision->SetHitCallback(this);
break;
Expand Down
Loading