From 88ce5e7b1a8ebc91e5db10e5001d8f8842584d82 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Thu, 20 Apr 2017 07:43:44 +0200 Subject: [PATCH] Fixed the bomb timer to be more... functional. --- Source/Shared/WeaponC4Bomb.c | 11 ++++------- freecs/csprogs.dat | Bin 178126 -> 178126 bytes freecs/progs.dat | Bin 182770 -> 182738 bytes 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Source/Shared/WeaponC4Bomb.c b/Source/Shared/WeaponC4Bomb.c index 7e856f30..f29852ab 100755 --- a/Source/Shared/WeaponC4Bomb.c +++ b/Source/Shared/WeaponC4Bomb.c @@ -187,6 +187,7 @@ void WeaponC4BOMB_Draw( void ) { void WeaponC4BOMB_Release( void ) { #ifdef SSQC self.fBombProgress = 0; + self.fAttackFinished = time + 1.0; #else View_PlayAnimation( ANIM_C4_IDLE ); iBombProgress = 0; @@ -202,22 +203,18 @@ void WeaponC4BOMB_PrimaryFire( void ) { if ( trace_fraction == 1 || self.fInBombZone == FALSE ) { Animation_ReloadWeapon(); WeaponC4BOMB_Release(); - self.fAttackFinished = time + 1.0; return; } // Play the sequence at the start if ( self.fBombProgress == 0 ) { + self.fBombProgress = time + 3.0f; Client_SendEvent( self, EV_WEAPON_PRIMARYATTACK ); Animation_ShootWeapon(); } - - // Add onto the planting-time thing - self.fBombProgress += frametime; - - centerprint( self, ftos(self.fBombProgress ) ); + // 3 seconds have passed, plant the bomb - if ( self.fBombProgress >= 3.0f ) { + if ( self.fBombProgress <= time ) { WeaponC4BOMB_Drop( trace_endpos ); } #else diff --git a/freecs/csprogs.dat b/freecs/csprogs.dat index c321e4f5bc75db7a8231ce40efbe350cf9f020f8..e596c5ea564c190af23f5f34e9393da7f7bca94a 100644 GIT binary patch delta 21 dcmX^2p6lFut_ej%K$fjrG!56ZDqe6Jeth-7EHxOz7hrQ3Jf;lcQ`M zujvwhkP>P1Az$<*ECOs6134~YX%^{pig6@H8RN+{NQm+Wu``kLo`Li4oFViG8 za!c$czOQkB9C3sKag-8qlEdN@jpAc&iZ6-nXIx;CxX1!=nGNC!RpKfQ;(Kn09|#7F zAITQCnJezF&hY<^#CnayRSfe7*;)Qq9;6`AnujP6pK@57zT0oOTlOb*m^GuRG6Dk!IoDwq zYXtd;ev+N<1~nhI=LsYm z7swJ9nIoEdpW2jcul1=^l*Cyvf_5>I;uIshm#MwX>?KUOdgauKcWD!!;0-svBTf9q z4DlyLB7!oJK#dqjtH`5UJVojVV-X>-f%&8jHnkN<}=!L@rHYA-BXb;zt?l$PuS05Z5RX*EuXAXcT$e z6bpzQZ9K;$v6=CfCM1UKjKf!yAVPuQcULNe_1@=KW zX`+-F;v_}lB4r|i8eu0W7Sb&akeXo}BqR<|XfQp)Zs5Hcb^{-!TKPm;#B#bs5hvN6$|V(3Oj=Y_(sa>6rJ$mX5{r@=IoGhT zt`6UkVYxy_#TqLja@Z)@V9TXWDoZNd*ur9s$~M+mJs)Y+KlgRc=RD`$bHC@=-95c; z_OJV9hhv;`OBXs9`;&7Yr8#&16~3FC?Og6|-yQdy8yN81hrV+!TiufvoLe6W&-czn z3iJH%s)lV{+q^RYGLL$(RK|NR&eOZCaL-x2Oqt;v$CA9oB+T)W?zEYE$X(~ByDPmF zuHjNqhD&$jerezqmu;`5fkiIQ%eIx2fAT8V;*|!p@35Edynpj#R~lI6b>BC~dnyvW z$Yt90?k`{W4sP~}sP+9NUJWhcaeBp0M#S?(%`ln>iDrsL3pL^Z&EidZ#1V!?JKjv= zJ#s`RMdD+s#pguCNxH;o&Wb;n647Ku8M7!90jk72nnV(vBE*ovP0@Y=vC)2#7bX~O z`Em-xIx55iG>Qf~#7<6$16&ksq{bNS`#!#cnQ&2&oCie)2^t<>EtjiGJF}IZlXQm=Ix-6ODXU ziJK`C>uC^MXcKQRC{8jihDe-e46{;PV59hpdQr(C@eTc=jIrr3e!k7>2#Xdrh&Jj( z46PzapU7ZTR1%kD>?BWoLW#(rR$N1iSWmAgVMJ^uD%q$fBwnCc?4?G$LbGV6M;vEZ z+>E!tSWk}FPLYUEEn10)gLH`w&Wb*!#2K;{8sAYUCa5xeHDDAWtTYiUyV2L zzi~VhTAoA0W&V=5c?r&q+OO|SvQqstyXG=Wy&EnqdTVIYY^`SVId_?T@@|WA+eW!(a)H{-RXAJ^mIGw7lhL-KRLaz(sD0~Iz<_@ipBJaC6ok> ztEVZL=JshSsnyymw1~Iq6-OBn-xHN#{6Pq5ot7wtLPDH7#8>7Ei$%{BWfrT zPg5=S5fLBLC8jtl5||PxWMvxJ6pHJp5~VbW`{@)l42idx6h{eW8Rsbwe^Mb*XcRZm zA<8)=9_FIhLF!`T82REn<>CUnL=5d>4JX9COo#_bUSd4SD)AX*;y4ZBciKdNK@rcm z2$Gm>WKVPLG_}+#+|D6`WjX##2D1H3?^VW>A0R%*c#W`VWrO&PI>Vol!oeJC_-y)= zu4GhvO5Ekf*W`&&N(|pmW&7n;x|9~Bo9Go=84-^XwbW=NBtD>6oTNs?(kzzIBQ`TE z4&&w8VIRr0HoH34PvYfVJNB))cIZvyruM kVaRH?Qzf3DN$jRm>}NUP{9lXMS@Ac?&gZhi{H`|IgfdBvi