Skip to content

Fix #3310: Improved client-side markers & Fix logic #3324

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 14 commits into from
Jul 31, 2025
Merged

Fix #3310: Improved client-side markers & Fix logic #3324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8bce353
Add events
Nico8340 Feb 27, 2024
08a5abf
Add logic
Nico8340 Feb 27, 2024
1fb7229
Merge branch 'master' into marker
Nico8340 Mar 1, 2024
38f198b
Merge branch 'master' into marker
Nico8340 Mar 9, 2024
5e3ff5f
Merge branch 'master' into marker
Nico8340 Apr 4, 2024
34bf4e3
Merge branch 'master' into marker
Nico8340 Apr 17, 2024
92c8375
Merge branch 'multitheftauto:master' into marker
Nico8340 Jun 6, 2024
ad2392d
Merge branch 'master' into marker
Nico8340 Jul 15, 2024
f206eb6
Merge branch 'multitheftauto:master' into marker
Nico8340 Aug 20, 2024
4d465e2
Make suggested changes
Nico8340 Aug 20, 2024
a5c2b63
Make suggested changes
Nico8340 Aug 21, 2024
83a228c
Merge branch 'master' into marker
Nico8340 Aug 26, 2024
2cf0f4c
Merge branch 'multitheftauto:master' into marker
Nico8340 Jan 16, 2025
d282f8b
Merge branch 'master' into marker
Nico8340 May 31, 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
9 changes: 6 additions & 3 deletions Client/mods/deathmatch/logic/CClientGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2741,10 +2741,13 @@ void CClientGame::AddBuiltInEvents()
m_Events.AddEvent("onClientCursorMove", "relativeX, relativeX, absoluteX, absoluteY, worldX, worldY, worldZ", NULL, false);

// Marker events
m_Events.AddEvent("onClientMarkerHit", "entity, matchingDimension", NULL, false);
m_Events.AddEvent("onClientMarkerLeave", "entity, matchingDimension", NULL, false);
m_Events.AddEvent("onClientMarkerHit", "entity, matchingDimension", nullptr, false);
m_Events.AddEvent("onClientMarkerLeave", "entity, matchingDimension", nullptr, false);

// Marker events
m_Events.AddEvent("onClientPlayerMarkerHit", "marker, matchingDimension", nullptr, false);
m_Events.AddEvent("onClientPlayerMarkerLeave", "marker, matchingDimension", nullptr, false);

// Pickup events
m_Events.AddEvent("onClientPickupHit", "entity, matchingDimension", NULL, false);
m_Events.AddEvent("onClientPickupLeave", "entity, matchingDimension", NULL, false);

Expand Down
52 changes: 34 additions & 18 deletions Client/mods/deathmatch/logic/CClientMarker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,28 +410,44 @@ void CClientMarker::StreamOut()
}
}

void CClientMarker::Callback_OnCollision(CClientColShape& Shape, CClientEntity& Entity)
void CClientMarker::Callback_OnCollision(CClientColShape& shape, CClientEntity& entity)
{
if (IS_PLAYER(&Entity))
{
// Call the marker hit event
CLuaArguments Arguments;
Arguments.PushElement(&Entity); // player that hit it
Arguments.PushBoolean((GetDimension() == Entity.GetDimension())); // matching dimension?
CallEvent("onClientMarkerHit", Arguments, true);
}
if (GetInterior() != entity.GetInterior())
return;

// Call the marker hit event
CLuaArguments arguments;
arguments.PushElement(&entity); // Hit element
arguments.PushBoolean(GetDimension() == entity.GetDimension()); // Matching dimension?
CallEvent("onClientMarkerHit", arguments, true);

if (!IS_PLAYER(&entity))
return;

CLuaArguments arguments2;
arguments2.PushElement(this); // marker
arguments2.PushBoolean(GetDimension() == entity.GetDimension()); // Matching dimension?
entity.CallEvent("onClientPlayerMarkerHit", arguments2, false);
}

void CClientMarker::Callback_OnLeave(CClientColShape& Shape, CClientEntity& Entity)
void CClientMarker::Callback_OnLeave(CClientColShape& shape, CClientEntity& entity)
{
if (IS_PLAYER(&Entity))
{
// Call the marker hit event
CLuaArguments Arguments;
Arguments.PushElement(&Entity); // player that hit it
Arguments.PushBoolean((GetDimension() == Entity.GetDimension())); // matching dimension?
CallEvent("onClientMarkerLeave", Arguments, true);
}
if (GetInterior() != entity.GetInterior())
return;

// Call the marker leave event
CLuaArguments arguments;
arguments.PushElement(&entity); // Hit element
arguments.PushBoolean(GetDimension() == entity.GetDimension()); // Matching dimension?
CallEvent("onClientMarkerLeave", arguments, true);

if (!IS_PLAYER(&entity))
return;

CLuaArguments arguments2;
arguments2.PushElement(this); // marker
arguments2.PushBoolean(GetDimension() == entity.GetDimension()); // Matching dimension?
entity.CallEvent("onPlayerMarkerLeave", arguments2, false);
}

void CClientMarker::CreateOfType(int iType)
Expand Down
Loading