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

Object sync - fixes and improvements #3405

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.

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

Closed
FileEX wants to merge 20 commits into multitheftauto:master from FileEX:feature/objects_sync
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d6e4000
Object sync improvments
FileEX May 26, 2024
c0e64fe
Merge branch 'master' into feature/objects_sync
FileEX May 27, 2024
d97c076
Merge branch 'master' into feature/objects_sync
FileEX May 28, 2024
66a0f46
Merge branch 'master' into feature/objects_sync
FileEX May 28, 2024
b8032c1
Merge branch 'master' into feature/objects_sync
FileEX May 29, 2024
39cc531
Merge branch 'master' into feature/objects_sync
FileEX May 31, 2024
8e45451
Merge branch 'master' into feature/objects_sync
FileEX Jun 4, 2024
9f63156
Merge branch 'master' into feature/objects_sync
FileEX Jun 11, 2024
6c555e0
Remove spawn functions
FileEX Jun 11, 2024
e435ef0
Fix build
FileEX Jun 11, 2024
c856dd9
Restored accidentally deleted
FileEX Jun 11, 2024
843af2d
New logic for onObjectMoveStop
FileEX Jun 11, 2024
481b02d
Merge branch 'master' into feature/objects_sync
FileEX Jun 11, 2024
5f95c24
Merge branch 'master' into feature/objects_sync
FileEX Jun 11, 2024
ef40425
Merge branch 'master' into feature/objects_sync
FileEX Jun 11, 2024
623ea2c
Merge branch 'master' into feature/objects_sync
FileEX Jun 14, 2024
fa35447
Merge branch 'master' into feature/objects_sync
FileEX Sep 10, 2024
868fbf7
Merge branch 'master' into feature/objects_sync
FileEX Sep 12, 2024
b475bf6
Merge branch 'master' into feature/objects_sync
FileEX Sep 13, 2024
dbf9748
Remove properties sync
FileEX Sep 13, 2024
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
View file Open in desktop
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
View file Open in desktop
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

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