diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-19 22:27:41 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-19 22:27:41 +0200 |
| commit | fec0028e12fb7e362344cfc07d7dcb6b07c29e04 (patch) | |
| tree | 675e1d491bd8f9cb80c707fbba45ae41005a4d31 /src/weapons/WeaponInfo.cpp | |
| parent | slightly restructured ped flags for convenience (diff) | |
| parent | Merge pull request #567 from erorcun/miami (diff) | |
| download | re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.gz re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.bz2 re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.lz re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.xz re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.zst re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.zip | |
Diffstat (limited to 'src/weapons/WeaponInfo.cpp')
| -rw-r--r-- | src/weapons/WeaponInfo.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/weapons/WeaponInfo.cpp b/src/weapons/WeaponInfo.cpp index 420171f2..d5e759b9 100644 --- a/src/weapons/WeaponInfo.cpp +++ b/src/weapons/WeaponInfo.cpp @@ -11,7 +11,7 @@ // Yeah... int32 CWeaponInfo::ms_aMaxAmmoForWeapon[WEAPONTYPE_TOTALWEAPONS] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }; CWeaponInfo CWeaponInfo::ms_apWeaponInfos[WEAPONTYPE_TOTALWEAPONS]; @@ -19,7 +19,17 @@ CWeaponInfo CWeaponInfo::ms_apWeaponInfos[WEAPONTYPE_TOTALWEAPONS]; // --MIAMI: Todo static char ms_aWeaponNames[][32] = { "Unarmed", + "BrassKnuckle", + "ScrewDriver", + "GolfClub", + "NightStick", + "Knife", "BaseballBat", + "Hammer", + "Cleaver", + "Machete", + "Katana", + "Chainsaw", "Grenade", "DetonateGrenade", "Molotov", @@ -61,8 +71,7 @@ CWeaponInfo::Initialise(void) ms_apWeaponInfos[i].m_fLifespan = 0.0f; ms_apWeaponInfos[i].m_fSpread = 0.0f; ms_apWeaponInfos[i].m_vecFireOffset = CVector(0.0f, 0.0f, 0.0f); - // TODO(Miami): ASSOCGRP_UNARMED - ms_apWeaponInfos[i].m_AnimToPlay = ASSOCGRP_STD; + ms_apWeaponInfos[i].m_AnimToPlay = ASSOCGRP_UNARMED; ms_apWeaponInfos[i].m_fAnimLoopStart = 0.0f; ms_apWeaponInfos[i].m_fAnimLoopEnd = 0.0f; ms_apWeaponInfos[i].m_fAnimFrameFire = 0.0f; |