From 52d08ba727c909c6cf9003b50558d20932ef50c0 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Fri, 27 Oct 2017 00:22:57 -0500 Subject: [PATCH] Fixed the obnoxious grenade-bounce sound issue. --- Source/Shared/WeaponFlashbang.c | 6 ++++++ Source/Shared/WeaponHEGrenade.c | 3 +++ Source/Shared/WeaponSmokeGrenade.c | 6 ++++++ freecs/progs.dat | Bin 193658 -> 193818 bytes 4 files changed, 15 insertions(+) diff --git a/Source/Shared/WeaponFlashbang.c b/Source/Shared/WeaponFlashbang.c index e1540fb3..734108a0 100755 --- a/Source/Shared/WeaponFlashbang.c +++ b/Source/Shared/WeaponFlashbang.c @@ -119,6 +119,12 @@ void WeaponFLASHBANG_Throw( void ) { remove( self ); } static void Weapon_FLASHBANG_Touch( void ) { + if ( other.solid == SOLID_TRIGGER ) { + return; + } + if ( other == self.owner ) { + return; + } if ( other.classname == "func_breakable" ) { Damage_Apply( other, self, 10, self.origin ); } diff --git a/Source/Shared/WeaponHEGrenade.c b/Source/Shared/WeaponHEGrenade.c index 19a3d216..991f2552 100755 --- a/Source/Shared/WeaponHEGrenade.c +++ b/Source/Shared/WeaponHEGrenade.c @@ -101,6 +101,9 @@ void WeaponHEGRENADE_Throw( void ) { remove( self ); } static void Weapon_HEGRENADE_Touch( void ) { + if ( other.solid == SOLID_TRIGGER ) { + return; + } if ( other == self.owner ) { return; } diff --git a/Source/Shared/WeaponSmokeGrenade.c b/Source/Shared/WeaponSmokeGrenade.c index 687f77f1..bc585a7b 100755 --- a/Source/Shared/WeaponSmokeGrenade.c +++ b/Source/Shared/WeaponSmokeGrenade.c @@ -107,6 +107,12 @@ void WeaponSMOKEGRENADE_Throw( void ) { self.nextthink = time + 5.0f; } static void Weapon_SMOKEGRENADE_Touch( void ) { + if ( other.solid == SOLID_TRIGGER ) { + return; + } + if ( other == self.owner ) { + return; + } if ( other.classname == "func_breakable" ) { Damage_Apply( other, self, 10, self.origin ); } diff --git a/freecs/progs.dat b/freecs/progs.dat index 32018350570ed86029ab8c0e5e91eef4b3688967..59f15cf14156515c655e080e8904fb7dd5fd4290 100644 GIT binary patch delta 2385 zcmajheN0wm9LDi;j*y~I5~5-vVu65yJfU{W%@Hd*hFpB!hy5zpzd z`D~l}=Mywgmz(U)s#@E+);&EsBI@satP|}#;+zg0Zhu(>hPV;@5$&cPynl?l^@a#r z(LVp}9JJ1Y8~^VVQ{8h{-FeK6^KNwuC>DiOisdwk$LSDH(kq@KEZ*2mz+hXvHcLw;sWQzcMKXlmSpABBrE?yPLk!n zvc}*G<=d41Ns9%ZHE*&6w9eL_++ZB_RdsWZ5^G;pW%vFPh_(39980FO2jMv2%lX(ee`SYcfwQbe9xxX z`La{IQG`yjqsQ#X3m?Y%6uW?kVeBy7Tj;Q=8$+*%C2X3JMnGgyB=V>b`7|0_)TvHQ zvrVqxlJfP0q#6w*i`OVL*ph0k7gDX&MT7Ew+C_jKF`eLm(M+P)&m!>+W#U`v#bw$= zFWq7gce>sF5yOd}Zo7^o--fp9QV~y`NTyZH;JnCVP%I|)cH>cU#5&f9T5831TEqp; zh@ZG7t`a@NxJHKIMU3E)8MfdOYLsrESya;{Y8eoliJECNkuLVIQtYEzyvts3icV3& z74aF7cNj}a6D5?0C#Vt|*)6tmLd4Q9W)VKin9WS_BE@1SmEs$kL>e8UkY4dHVY7|L z35ZIH#1<;V9vZ~~j)+5C5+4(iW_(AoSWBTOr(C>AgE&dM=%z<}P4FC}pG3n83TN>g zyG`RLQ+gZqVis*8mu^vjJJ)!cIPpCBVhg3BfjaRztzsYN#oG*u{lwmB98)EN)O2s8 z9_4?J`>54)KP`qguKay^#HR#j85c-2crwciVo8=akyo;;zah)|6R1}si8e8tZjp(b zZ7e5FRFN;fq*VMuow!b`;f0Ro%WS(z2@ERDBR0nhr&?(dd&Md`MLAc* zIwI#A$4L_>C=pkwGQ5#d?3r(`(C{cun)Z-}=i6+8&s?7hiWNSiQ3RXv?LX8=lcHDY z5Zmb$O@u8lb`TJ6QzZJR5dAb7UidhUF0gg(=aSM&LKYeuNfvPwin)}FJQ~C*+C>dL z;xNJY7$1@-PO(V*NSPQ-y~w6bJWIFOg}cZ&N1PZ>zKEt&OrTE0(kdo#UNkc(E)u)g z_?{ebnKh!9TG2;~=;w^#IWb&cY_~8ph6x3BY2(Q#u-UkSs|&oFcHa;*U_X$YzW`9< BhAaR8 delta 2334 zcmYk;e@s<%7{~E*PKgp?prF!*g^GxB5hO@VFcgsMFQCSXHe5Jq>e7wG7B2pvNyYN_ zvbS2Ov{2b{O%utol1-gdI5kOVvW1h9HcCngTvX4eyO#H#*LgnAbME<`^WFWi@28Nv zw?cA9I*t=J!Ev_y;yBR{JI)*Vp0i@K~fcAW3ecuu$V zv#s~vYt@~dxjr|ox}vGVy)vG(?e5s-JrmshLGHNbrzg4jW60d$1~G5DJGyx=!M#4{ z&Y?Zlo8m5FNcf4KW;{ujSVfswO|4kVQL&B7Vm|}oJ)+{gDcqUng|Rfwi*OH9YJvMH zHR5!jx)>mgeuWPcIo*gMU8GSW=20y&X%O>i6;IJ8HV__fY$H|dpjaHCN*t$NoaCJN zm|k&)&>6O>Tk*E4CuZ2H&QoN8`z@8?JL<%BTEtCy49?83;fXVC_$PcbE&r85gM^uu zZ?@bU3}W9*Z?Zdz&(t4Hw;02S1YLK4#9ms(0s6#OgwHmitpGfZt|Jvq1*8O zet@7?J$0xYfmbO@W(9; zBUMbHSj?tMJWjn>#W}H_Ua^_bc}5M%;%$n=J}Sk2>cjzB#D^Lg$E6G}%%14~#~t`G ztldeW;r$ZMOBuG1+xJY|z2`WQZcQ&_M5d8VyvPZJe#%uHWVfgfgoo%-br^TPag12; z5q@!kb>c#xca0`h9dsJrz*zp8ZwvW7&}ME5z7hAHLCH6Jrs&B*eE*KYj^|W`8?Oo zkEUB`CL?9O~A{u^W%xlvos68C}5o^Wv5t4lQ==A zXku90B*t&&|2dIdzc<+%p2%9$KD5Uyw%hraxBz7gDSTelIFc6ICe@O)*rGQn6I-Yi zTRAH1msQv=tLPwViP1@h;SEQza*16hj~bVidh1n9$|M10;)3io_Ty#a`;fC0fKc^oXkj x=Ns+#L