summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-08-03 15:08:31 +0200
committerGitHub <noreply@github.com>2019-08-03 15:08:31 +0200
commit3910055bac7856a9bacab8e0c6877f9f60207285 (patch)
tree37a42c0b9ecdf75b8d4a524dbf76a10e9b8fe984 /src/peds
parentMerge pull request #178 from Fire-Head/master (diff)
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-3910055bac7856a9bacab8e0c6877f9f60207285.tar
re3-3910055bac7856a9bacab8e0c6877f9f60207285.tar.gz
re3-3910055bac7856a9bacab8e0c6877f9f60207285.tar.bz2
re3-3910055bac7856a9bacab8e0c6877f9f60207285.tar.lz
re3-3910055bac7856a9bacab8e0c6877f9f60207285.tar.xz
re3-3910055bac7856a9bacab8e0c6877f9f60207285.tar.zst
re3-3910055bac7856a9bacab8e0c6877f9f60207285.zip
Diffstat (limited to 'src/peds')
-rw-r--r--src/peds/Ped.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index d05568f6..8b988772 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -5349,12 +5349,12 @@ CPed::CreateDeadPedWeaponPickups(void)
// otherwise try another position (but disregard second check apparently)
angleToPed += 3.14f;
pickupPos = GetPosition();
- pickupPos.x = 1.5f * Sin(angleToPed);
- pickupPos.y = 1.5f * Cos(angleToPed);
+ pickupPos.x += 1.5f * Sin(angleToPed);
+ pickupPos.y += 1.5f * Cos(angleToPed);
pickupPos.z = CWorld::FindGroundZFor3DCoord(pickupPos.x, pickupPos.y, pickupPos.z, &found) + 0.5f;
}
if (found)
- CPickups::GenerateNewOne_WeaponType(pickupPos, weapon, PICKUP_ONCE_TIMEOUT, min(weaponAmmo, CPickups::ms_maxAmmosForWeapons[weapon]));
+ CPickups::GenerateNewOne_WeaponType(pickupPos, weapon, PICKUP_ONCE_TIMEOUT, min(weaponAmmo, AmmoForWeapon_OnStreet[weapon]));
}
ClearWeapons();
}