diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-07-25 21:01:00 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-07-25 21:01:00 +0300 |
| commit | d83b8cf940b9116a334ae982126b38de06caecfd (patch) | |
| tree | 9b819d88fce9719c9f78557ff10025592b322e40 /src/control | |
| parent | 1619d2395eb1ead70d562f6777b1a203040ce1a3 (diff) | |
| parent | 5032d24ad82787d71ecc534c68f96eb9691fd673 (diff) | |
Merge branch 'miami' into lcs
# Conflicts:
# src/renderer/Hud.cpp
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Script5.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp index f6036b50..502e6d72 100644 --- a/src/control/Script5.cpp +++ b/src/control/Script5.cpp @@ -1928,7 +1928,7 @@ bool CRunningScript::CheckDamagedWeaponType(int32 actual, int32 type) if (type == WEAPONTYPE_ANYMELEE) { if (actual <= WEAPONTYPE_CHAINSAW) return true; - if (actual - WEAPONTYPE_GRENADE <= WEAPONTYPE_MINIGUN) + if (actual >= WEAPONTYPE_GRENADE && actual <= WEAPONTYPE_UNIDENTIFIED) return false; return false; } |