From c43906bff40d892963e42cadc200125678beef61 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sun, 9 Dec 2018 06:06:32 +0100 Subject: [PATCH] That's the proper way of disabling the impact effects for the knife... *cough* --- Source/Shared/BaseMelee.c | 4 ++-- Source/Shared/Effects.c | 4 ++-- freecs/csprogs.dat | Bin 227278 -> 227230 bytes freecs/progs.dat | Bin 227902 -> 227926 bytes 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Shared/BaseMelee.c b/Source/Shared/BaseMelee.c index ef893056..d40640e1 100755 --- a/Source/Shared/BaseMelee.c +++ b/Source/Shared/BaseMelee.c @@ -52,9 +52,9 @@ int BaseMelee_Attack( void ) { sound( self, CHAN_WEAPON, sprintf( "weapons/knife_hit%d.wav", floor( ( random() * 4 ) + 1 ) ), 1, ATTN_NORM ); } Damage_Apply( trace_ent, self, wptTable[ self.weapon ].iDamage, trace_endpos, FALSE ); - }/* else { + } else { Effect_Impact( IMPACT_MELEE, trace_endpos, trace_plane_normal ); - }*/ + } return TRUE; } diff --git a/Source/Shared/Effects.c b/Source/Shared/Effects.c index 34b2248e..77a4b4f0 100755 --- a/Source/Shared/Effects.c +++ b/Source/Shared/Effects.c @@ -253,8 +253,8 @@ void Effect_Impact( int iType, vector vPos, vector vNormal ) { #else switch ( iType ) { case IMPACT_MELEE: - pointparticles( DECAL_SHOT, vPos, vNormal, 1 ); - pointparticles( PARTICLE_PIECES_BLACK, vPos, vNormal, 1 ); + /*pointparticles( DECAL_SHOT, vPos, vNormal, 1 ); + pointparticles( PARTICLE_PIECES_BLACK, vPos, vNormal, 1 );*/ pointsound( vPos, "weapons/knife_hitwall1.wav", 1, ATTN_STATIC ); break; case IMPACT_EXPLOSION: diff --git a/freecs/csprogs.dat b/freecs/csprogs.dat index 3b5af5ca18d3b656943056e19a5725076c807a9b..b7af29406b10ab6a819538af74dbc06ad55584cb 100644 GIT binary patch delta 1114 zcmXBUO-Phc7{&4XzEa}C%G4-g3XL=)p@~F|TqsQ?DKU^lkc5$zlu=-Y3j--X#vH$L z`Zt(?QIU|4k(iN?p`egafsuq%3n449$Ua;c-9xM2xzBU%_IWWEePb@#8)=NGIB3iX zpJOuD88aMqjVH#Kdx;Sy%Q0qax@!hqV_IzQ?Jmc(w|Zlp`f6XF&nY;zG}BIv>3@05 z8Frk}x=@MJA1ZN=uXpyaSmSPR-jPsinZhUjP%0dPVmZBH0}~>N1(A)X&a#_qkw>u@ zCLngwBL;XSw)0cuu%_O!k1P?ONCc@7iF6AesDJ@;E2<6Sh#^=&s;-qZ`LHrEf}4l;VPJoKr|j&~}fKFN!&9Aunjxx9plTN~21T zl)maq1x}OgK4zo%Las2BiAY+-TKdE`CPfB|VlN5JmJ|5INlL|Of}(+5(aeNsV?l)Q zv{>GgE#@c|^8~~KJr?)xGG4d1iB1GRHH~FWt7SD=!b6crq(&suEz%hmO?(#}#J5?V zk|{n@D3YiaTe&TA7!&!-iUY)4v3wv+eBzK;MU`lxOBhB(EHh#^(e0K>yy6lCViT1j zjZU$HA@PD~(M?py@{m+9hF|>VoQNkZ3K(m6fsY}DB`RrCnV|^5YLzr zQ#e?Duu-feS8Sn7_-PeK=@WHKiWC-wmxOB;KR$7oQn8bu$fZ}@WJ35^5U22jEgfWw aHx!FB0wSFrkF4&$M{PMBLu{W!5~Y^pCMkWtk0`HmAU5@T=SDrod_1%#$chhbF$5%v)r3zyXh03h(GT5Lz);#zKEwxBvB`l=@8556|0Fm z;aE?qcuAgEN~vh2RxISHSiu*Ojqjx6EPipG95I7KVilLgX4=IudPD`W6^;-o;vw0h zjs0RQQ4yg<)X*)iG2)ctCQ0HxS>idxVvuT)LbEtbm$;5S?YPZ!(ZotIj@_b_%KxVZ zF`Ex!E<+BALf&X*hrF?blr}2eRXV8jR_T&U?mhQH?$#FGi5(0$C8h&K8~9|>n1F$9E3qz!#B-uhKCMznDReNa2tO za9LE*E^6r!&xk$e_)dyQCR@y7zgR(3Y@kJKqFa1s#CgY8lEg%^L>0v%hH8;Ovsg`+ zIEt-uoMO6|$x5+^-C{A7;w=s04j;q=hQw>8R6B;q6cgAbb`Tc7xhI0W6OS1XgG{>M z*vS%cn4kz#AzpAxeBzB5pkIt90mmEyBA0EVh;k98Ud*CX%%@M}5?|xkPMTOszF13{ oxIvxBr980AwNdY9S4>mMF!x>j10V)xYybcN diff --git a/freecs/progs.dat b/freecs/progs.dat index ab62e7162af3381bd23024d0064df2ecd452f104..80d05df0491d8cfd4ad2430e0b344ef15f8ec8c2 100644 GIT binary patch delta 1953 zcmWmFeN2^Q7{~GFIf{i!!W4}hDjG93T~JfQNz)}dd@0CTl2Ve=B*J1zMGcKMLfmMv zMPE@d2@Xn#@pj_HNT{%}q=l0ff6$~!6OGLyVlszx{mwt1?R($XcAopW&(05bg8sM@ z6!VbdI7{a_&ViY(GxG_@xz*-zjy~czbx%%l{&pSb$`+3^Yl`E1Zu_pyaGj3gnAz^y zym(){TeHIr!@t8lKQGR)9rjt|Y;vZX8O|=xGIwJ^O|siulk6E<5_M#Y8;(qS6TmE zeHTOOuM${gyv1^Hh$Qhb*`k0_gR7dkRAn=#7*ua0;Iz?9lsL~;@e^61pAs=bt60Q< zh{io*JVm6~M}kNvQ+z_P_!OTwLcci1gs3K>+Gr(S{6@O?mm=|idNGSWv5IlAnecCn zB-V-7NE7c;C<>?*W%P=A#zZ?|HO8;Ri9S+=pL{W&YH@%baRk5kg3z-@6|v$+Qp6y6 z;wD}(LAQuzL~JCa*4WPqQ9!b&Bv)LbT#V2q?lUZc2s&rXCPr*yyLg`*afmW;f==-# zL*f>J-x`xF7a=5xd1Q+{l!`Xm#V-tsYXsC8w}}#W*(&}cOH8Lkcxe^q7!Wsc>x~CQ zim4=sxnzok6pN?viAMUx1t!E@A{vZWh!<~=EHJ#*OIWS9P4qh0zy!kTQybmGJeQpE!D#eS;ABt3@5iQsmVXR*7K zP@mPy#EMZ;#8mP`7G6Za$s3YV%!^aA7on$eWT=6pHBA+f%%dnV6P_r?E7!k~N zF^?RBj%Is?v(5I4il9?{F+-w(z!qChY_a7vEw=m*NfzvaWUGI#en#C-yZR`DVw`|h xV-`_j30uW7vcxl#i1oCJYz9OwZky3Tq_|9im?TpKG#9sdPG6X|_Cx)h{tsUKm(la%_S*R@@{?rXbmJPN<~ zC_G`7<2bJ^a-7|BT_D7P^NQO@pJ--Mv=E7Lg(T5Wj`)L8aSy*3 zr&mldCZ>s~HbO`gOUM?>DG^!t#4dV78Ka__aIbNj1o1bSVuE6^ni}yT-3FJvp63|x zdX~AhgdMehop^DZ3^7cRSc+Gyrc114NUS6Dd*dDA#8%Qp7KI{@DzTRiv7SNk5$+Gh zXT*v^(!{?Mh%c!WM+k}*Ziy~t#BapZ7~`ahr{s$O72+Pv!oz?_=ZSci=wrq%Qp6eZ z3_dyLnNRgG&q6myKz%X&VhvN`O`?7@wv#LlkSmT;ChRMUi}ZEdbRvAlb`r%tvPBss;xInpqerwcDy|TI!ni?#7$#GUQ!ExyBVyZA8 z#RRV3m?Bm@CQZCefx%9{Z9VR{ty>7HXK_npGo$fMjaSv#IG@xy>-)(UB~*xmG>fAQ z82nymi)Wv*#Z5$?vffIHXeUox=8(8SK-{NaL^CDgi8^hpBw6HAfa#3hQv9lT%)AWy}eBmb!YL37sT4~H8nm|A$w%7kQU8zV4r4AUVi|cNjzc1mfJmWVe8H61OH`-PMY6a?u9&7w Tc-rbaJ*O@`zhbZbQl0++QcIGH