Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Client/mods/deathmatch/logic/CClientCommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
// Defines the maximum size for a HTTP Download URL (with file / directory information appended)
#define MAX_HTTP_DOWNLOAD_URL_WITH_FILE 768

#define WITH_OBJECT_SYNC 1

enum eHTTPDownloadType
{
HTTP_DOWNLOAD_DISABLED = 0,
Expand Down
8 changes: 7 additions & 1 deletion Client/mods/deathmatch/logic/CClientGame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4783,7 +4783,13 @@ bool CClientGame::ObjectDamageHandler(CObjectSAInterface* pObjectInterface, floa
else
Arguments.PushNil();

return pClientObject->CallEvent("onClientObjectDamage", Arguments, true);
bool bContinue = pClientObject->CallEvent("onClientObjectDamage", Arguments, true);
if (bContinue && !pClientObject->IsLocalEntity() && pClientAttacker)
{
pClientObject->SetAttackerID(pClientAttacker->GetID());
}

return bContinue;
}
}
return true;
Expand Down
Loading