summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-13 13:14:56 +0100
committeraap <aap@papnet.eu>2020-11-13 13:14:56 +0100
commit257f45c3c37530ec86bb4e5906d1cf5b6005cf38 (patch)
tree014b72e88afdb350d5f7dbd9e23debd07054fbec /src/peds
parentCPed review, part 1 (diff)
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
downloadre3-257f45c3c37530ec86bb4e5906d1cf5b6005cf38.tar
re3-257f45c3c37530ec86bb4e5906d1cf5b6005cf38.tar.gz
re3-257f45c3c37530ec86bb4e5906d1cf5b6005cf38.tar.bz2
re3-257f45c3c37530ec86bb4e5906d1cf5b6005cf38.tar.lz
re3-257f45c3c37530ec86bb4e5906d1cf5b6005cf38.tar.xz
re3-257f45c3c37530ec86bb4e5906d1cf5b6005cf38.tar.zst
re3-257f45c3c37530ec86bb4e5906d1cf5b6005cf38.zip
Diffstat (limited to 'src/peds')
-rw-r--r--src/peds/Ped.cpp2
-rw-r--r--src/peds/Ped.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 222ac638..56635315 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -19969,7 +19969,7 @@ CPed::Load(uint8*& buf)
CStreaming::LoadAllRequestedModels(false);
}
- GiveWeapon(bufWeapon.m_eWeaponType, bufWeapon.m_nAmmoTotal);
+ GiveWeapon(bufWeapon.m_eWeaponType, bufWeapon.m_nAmmoTotal, false);
}
}
SkipSaveBuf(buf, 252);
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 3a4edfae..497994c2 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -697,7 +697,7 @@ public:
void PlayFootSteps(void);
void QuitEnteringCar(void);
void BuildPedLists(void);
- int32 GiveWeapon(eWeaponType weaponType, uint32 ammo, bool unused = false);
+ int32 GiveWeapon(eWeaponType weaponType, uint32 ammo, bool unused = true);
void CalculateNewOrientation(void);
float WorkOutHeadingForMovingFirstPerson(float);
void CalculateNewVelocity(void);