diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-09-11 15:39:35 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-09-11 15:39:35 +0200 |
| commit | f0b15ee053ec0e4a26652f552e59701a778a201a (patch) | |
| tree | d57abdfde1eb05f5999a9857a0473cde68239dca /src/weapons/WeaponInfo.cpp | |
| parent | fixes (diff) | |
| parent | Merge pull request #701 from erorcun/miami (diff) | |
| download | re3-f0b15ee053ec0e4a26652f552e59701a778a201a.tar re3-f0b15ee053ec0e4a26652f552e59701a778a201a.tar.gz re3-f0b15ee053ec0e4a26652f552e59701a778a201a.tar.bz2 re3-f0b15ee053ec0e4a26652f552e59701a778a201a.tar.lz re3-f0b15ee053ec0e4a26652f552e59701a778a201a.tar.xz re3-f0b15ee053ec0e4a26652f552e59701a778a201a.tar.zst re3-f0b15ee053ec0e4a26652f552e59701a778a201a.zip | |
Diffstat (limited to 'src/weapons/WeaponInfo.cpp')
| -rw-r--r-- | src/weapons/WeaponInfo.cpp | 51 |
1 files changed, 46 insertions, 5 deletions
diff --git a/src/weapons/WeaponInfo.cpp b/src/weapons/WeaponInfo.cpp index 0f71aeda..6debf725 100644 --- a/src/weapons/WeaponInfo.cpp +++ b/src/weapons/WeaponInfo.cpp @@ -9,16 +9,57 @@ #include "ModelInfo.h" #include "ModelIndices.h" +uint16 CWeaponInfo::ms_aReloadSampleTime[WEAPONTYPE_TOTALWEAPONS] = +{ + 0, // UNARMED + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, // GRENADE + 0, // DETONATEGRENADE + 0, // TEARGAS + 0, // MOLOTOV + 0, // ROCKET + 250, // COLT45 + 250, // PYTHON + 650, // SHOTGUN + 650, // SPAS12 SHOTGUN + 650, // STUBBY SHOTGUN + 400, // TEC9 + 400, // UZIhec + 400, // SILENCED_INGRAM + 400, // MP5 + 300, // M16 + 300, // AK47 + 423, // SNIPERRIFLE + 423, // LASERSCOPE + 400, // ROCKETLAUNCHER + 0, // FLAMETHROWER + 0, // M60 + 0, // MINIGUN + 0, // DETONATOR + 0, // HELICANNON + 0 // CAMERA +}; + // Yeah... -int32 CWeaponInfo::ms_aMaxAmmoForWeapon[WEAPONTYPE_TOTALWEAPONS] = { +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 }; CWeaponInfo CWeaponInfo::ms_apWeaponInfos[WEAPONTYPE_TOTALWEAPONS]; - -// --MIAMI: Todo -static char ms_aWeaponNames[][32] = { +char CWeaponInfo::ms_aWeaponNames[WEAPONTYPE_TOTALWEAPONS][32] = +{ "Unarmed", "BrassKnuckle", "ScrewDriver", @@ -61,7 +102,7 @@ static char ms_aWeaponNames[][32] = { CWeaponInfo* CWeaponInfo::GetWeaponInfo(eWeaponType weaponType) { - return &CWeaponInfo::ms_apWeaponInfos[weaponType]; + return &ms_apWeaponInfos[weaponType]; } // --MIAMI: done except WEAPONTYPE_TOTALWEAPONS value |