Skip to content

Server side weapon reloading #3936

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 7 commits into from
Jan 10, 2025
Merged

Server side weapon reloading #3936

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cbaaf05
Sync
Nico8340 Jan 9, 2025
b2c0a73
Defs
Nico8340 Jan 9, 2025
2c4760a
Logic
Nico8340 Jan 9, 2025
ee137ca
Make requested changes
Nico8340 Jan 9, 2025
ee1b6d9
Make requested changes
Nico8340 Jan 9, 2025
b61970e
Make suggested changes
Nico8340 Jan 10, 2025
e4e6c86
Merge branch 'master' into reloading
Nico8340 Jan 10, 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
Prev Previous commit
Next Next commit
Make requested changes 
Co-authored-by: Marek Kulik <noreply@bug32.com>
  • Loading branch information
@Nico8340 @botder
Nico8340 and botder authored Jan 9, 2025
commit ee1b6d96c8149602c074196da16876b350024839
3 changes: 1 addition & 2 deletions Server/mods/deathmatch/logic/CPed.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ struct SBodyPartName
SBodyPartName BodyPartNames[10] = {{"Unknown"}, {"Unknown"}, {"Unknown"}, {"Torso"}, {"Ass"},
{"Left Arm"}, {"Right Arm"}, {"Left Leg"}, {"Right Leg"}, {"Head"}};

CPed::CPed(CPedManager* pPedManager, CElement* pParent, unsigned short usModel)
: CElement(pParent), m_reloadingWeapon(false)
CPed::CPed(CPedManager* pPedManager, CElement* pParent, unsigned short usModel) : CElement(pParent)
{
// Init
m_pPedManager = pPedManager;
Expand Down
Loading