nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/nullifiedcat/cathook/

Browse Source
This commit is contained in:
nullifiedcat 2017-07-06 22:22:20 +03:00
commit c2d6171e96
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/helpers.cpp
View File

@ -445,7 +445,9 @@ weaponmode GetWeaponMode() {
weapon->m_iClassID == CL_CLASS(CTFBat_Giftwrap) || weapon->m_iClassID == CL_CLASS(CTFBat_Giftwrap) ||
weapon->m_iClassID == CL_CLASS(CTFFlareGun) || weapon->m_iClassID == CL_CLASS(CTFFlareGun) ||
weapon->m_iClassID == CL_CLASS(CTFFlareGun_Revenge) || weapon->m_iClassID == CL_CLASS(CTFFlareGun_Revenge) ||
weapon->m_iClassID == CL_CLASS(CTFSyringeGun)) { weapon->m_iClassID == CL_CLASS(CTFSyringeGun) ||
weapon->m_iClassID == CL_CLASS(CTFCrossbow) ||
weapon->m_iClassID == CL_CLASS(CTFShotgunBuildingRescue)) {
return weaponmode::weapon_projectile; return weaponmode::weapon_projectile;
} else if (weapon->m_iClassID == CL_CLASS(CTFJar) || } else if (weapon->m_iClassID == CL_CLASS(CTFJar) ||
weapon->m_iClassID == CL_CLASS(CTFJarMilk)) { weapon->m_iClassID == CL_CLASS(CTFJarMilk)) {
@ -502,6 +504,14 @@ bool GetProjectileData(CachedEntity* weapon, float& speed, float& gravity) {
} else if (weapon->m_iClassID == CL_CLASS(CTFSyringeGun)) { } else if (weapon->m_iClassID == CL_CLASS(CTFSyringeGun)) {
rgrav = 0.2f; rgrav = 0.2f;
rspeed = 990.0f; rspeed = 990.0f;
} else if (weapon->m_iClassID == CL_CLASS(CTFCrossbow)) {
// TODO, get correct gravity
rgrav = 0.2f;
rspeed = 2400.0f;
} else if (weapon->m_iClassID == CL_CLASS(CTFShotgunBuildingRescue)) {
// TODO, get correct gravity
rgrav = 0.2f;
rspeed = 2400.0f;
} }
speed = rspeed; speed = rspeed;
gravity = rgrav; gravity = rgrav;