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 24708f8

Browse files
authored
Colshape IDs fix (#4115)
1 parent c10a283 commit 24708f8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ void CClientMarker::CreateOfType(int iType)
447447
CClientCheckpoint* pCheckpoint = new CClientCheckpoint(this);
448448
pCheckpoint->SetCheckpointType(CClientCheckpoint::TYPE_NORMAL);
449449
m_pMarker = pCheckpoint;
450-
m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
450+
m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
451451
m_pCollision->m_pOwningMarker = this;
452452
m_pCollision->SetHitCallback(this);
453453
break;
@@ -458,7 +458,7 @@ void CClientMarker::CreateOfType(int iType)
458458
CClientCheckpoint* pCheckpoint = new CClientCheckpoint(this);
459459
pCheckpoint->SetCheckpointType(CClientCheckpoint::TYPE_RING);
460460
m_pMarker = pCheckpoint;
461-
m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
461+
m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
462462
m_pCollision->m_pOwningMarker = this;
463463
m_pCollision->SetHitCallback(this);
464464
break;
@@ -469,7 +469,7 @@ void CClientMarker::CreateOfType(int iType)
469469
CClient3DMarker* p3DMarker = new CClient3DMarker(this);
470470
p3DMarker->Set3DMarkerType(CClient3DMarker::TYPE_CYLINDER);
471471
m_pMarker = p3DMarker;
472-
m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
472+
m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
473473
m_pCollision->m_pOwningMarker = this;
474474
m_pCollision->SetHitCallback(this);
475475
break;
@@ -480,7 +480,7 @@ void CClientMarker::CreateOfType(int iType)
480480
CClient3DMarker* p3DMarker = new CClient3DMarker(this);
481481
p3DMarker->Set3DMarkerType(CClient3DMarker::TYPE_ARROW);
482482
m_pMarker = p3DMarker;
483-
m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
483+
m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
484484
m_pCollision->m_pOwningMarker = this;
485485
m_pCollision->SetHitCallback(this);
486486
break;
@@ -489,7 +489,7 @@ void CClientMarker::CreateOfType(int iType)
489489
case MARKER_CORONA:
490490
{
491491
m_pMarker = new CClientCorona(this);
492-
m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
492+
m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
493493
m_pCollision->m_pOwningMarker = this;
494494
m_pCollision->SetHitCallback(this);
495495
break;

0 commit comments

Comments
(0)

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