From 577a59afb852ab6e3c3abff175840c09e034beac Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Fri, 2 Dec 2016 00:33:44 +0100 Subject: [PATCH] Reload times are now the real ones --- Source/Client/Draw.c | 1 + Source/Client/HUD.c | 4 +- Source/Client/Project | 17 ++++-- Source/Server/.Client.c.un~ | Bin 11424 -> 0 bytes Source/Server/.Defs.h.un~ | Bin 16246 -> 0 bytes Source/Server/.Entities.c.un~ | Bin 17851 -> 0 bytes Source/Server/.FuncBuyZone.c.un~ | Bin 7599 -> 0 bytes Source/Server/.Main.c.un~ | Bin 9034 -> 0 bytes Source/Server/.Timer.c.un~ | Bin 964 -> 0 bytes Source/Server/.client.qc.un~ | Bin 615 -> 0 bytes Source/Server/.main.qc.un~ | Bin 1548 -> 0 bytes Source/Server/.progs.src.un~ | Bin 12762 -> 0 bytes Source/Server/Input.c | 26 ++++++--- Source/Shared/WeaponAK47.c | 2 +- Source/Shared/WeaponAUG.c | 2 +- Source/Shared/WeaponAWP.c | 4 +- Source/Shared/WeaponDeagle.c | 4 +- Source/Shared/WeaponElites.c | 94 ++++++++++++++++++++++++++++++- Source/Shared/WeaponFiveSeven.c | 2 +- Source/Shared/WeaponG3SG1.c | 2 +- Source/Shared/WeaponGlock18.c | 2 +- Source/Shared/WeaponM4A1.c | 2 +- Source/Shared/WeaponMP5.c | 2 +- Source/Shared/WeaponMac10.c | 2 +- Source/Shared/WeaponP228.c | 2 +- Source/Shared/WeaponP90.c | 2 +- Source/Shared/WeaponSG550.c | 2 +- Source/Shared/WeaponSG552.c | 2 +- Source/Shared/WeaponScout.c | 2 +- Source/Shared/WeaponTMP.c | 2 +- Source/Shared/WeaponUMP45.c | 2 +- Source/Shared/WeaponUSP45.c | 2 +- Source/Shared/Weapons.c | 6 +- 33 files changed, 148 insertions(+), 40 deletions(-) delete mode 100644 Source/Server/.Client.c.un~ delete mode 100644 Source/Server/.Defs.h.un~ delete mode 100644 Source/Server/.Entities.c.un~ delete mode 100644 Source/Server/.FuncBuyZone.c.un~ delete mode 100644 Source/Server/.Main.c.un~ delete mode 100644 Source/Server/.Timer.c.un~ delete mode 100644 Source/Server/.client.qc.un~ delete mode 100644 Source/Server/.main.qc.un~ delete mode 100644 Source/Server/.progs.src.un~ diff --git a/Source/Client/Draw.c b/Source/Client/Draw.c index c0cba828..9dea980c 100644 --- a/Source/Client/Draw.c +++ b/Source/Client/Draw.c @@ -33,6 +33,7 @@ void CSQC_UpdateView( float fWinWidth, float fWinHeight, float fGameFocus ) { if( fGameFocus == TRUE ) { HUD_Draw(); CSQC_VGUI_Draw(); + drawstring( '320 240 0 ', sprintf( "FRAMETIME: %f",eViewModel.frame1time ) , '8 8 0', '1 1 1', 1, 0 ); } } diff --git a/Source/Client/HUD.c b/Source/Client/HUD.c index abe3e067..d4cd3992 100644 --- a/Source/Client/HUD.c +++ b/Source/Client/HUD.c @@ -141,10 +141,10 @@ void HUD_Draw( void ) { HUD_DrawNums( getstatf( STAT_MONEY ), vMoneyPos ); // Ammo - vector vAmmoClipPos = [ vVideoResolution_x - 160, vVideoResolution_y - 42 ]; + vector vAmmoClipPos = [ vVideoResolution_x - 136, vVideoResolution_y - 42 ]; HUD_DrawNums( getstatf( STAT_CURRENT_CLIP ), vAmmoClipPos ); - vector vAmmoCalPos = [ vVideoResolution_x - 88, vVideoResolution_y - 42 ]; + vector vAmmoCalPos = [ vVideoResolution_x - 64, vVideoResolution_y - 42 ]; HUD_DrawNums( getstatf( STAT_CURRENT_CALIBER ), vAmmoCalPos ); // Caliber icon diff --git a/Source/Client/Project b/Source/Client/Project index c2ec261c..53b4485f 100644 --- a/Source/Client/Project +++ b/Source/Client/Project @@ -28,11 +28,18 @@ long_line_behaviour=1 long_line_column=72 [files] -current_page=1 -FILE_NAME_0=1317;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponUSP45.c;0;4 -FILE_NAME_1=3034;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponGlock18.c;0;4 -FILE_NAME_2=0;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FServer%2FInput.c;0;4 -FILE_NAME_3=740;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FClient%2FView.c;0;4 +current_page=10 +FILE_NAME_0=0;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FClient%2FInit.c;0;4 +FILE_NAME_1=0;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FServer%2FEntHostage.c;0;4 +FILE_NAME_2=1141;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponMP5.c;0;4 +FILE_NAME_3=1142;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponP90.c;0;4 +FILE_NAME_4=1149;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponSG550.c;0;4 +FILE_NAME_5=1150;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponSG552.c;0;4 +FILE_NAME_6=0;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponM3.c;0;4 +FILE_NAME_7=369;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponM4A1.c;0;4 +FILE_NAME_8=0;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponUSP45.c;0;4 +FILE_NAME_9=1222;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponElites.c;0;4 +FILE_NAME_10=1162;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponFiveSeven.c;0;4 [VTE] last_dir=/home/eukara diff --git a/Source/Server/.Client.c.un~ b/Source/Server/.Client.c.un~ deleted file mode 100644 index 483b946bb31df19977fcae234d0c01c87f0e0655..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11424 zcmeI2%Zn6O6o;#g#%N5U6OHe&nAHqEViZvrW}|LG2pLg>WHU4~Ep}|Hhpu)c41ywN zlm8%_;4%UK1~)=t$RY$1Lb3~pNTMV{Tx4U;ck7FNhfS9*63+^O4DUFTlT_dEAB z{bBve7w41H&4tMYTKJx)V!WWnquu)9g_v`tH^TLQj)35}=Ws;P z-!R%Kh43Gh0+wAX&HB>xOgw+JeX3EfCGB^Uv$fVrtrgG7)5@xQX_r*@NZ}=icJh)Qliy&KPx(H7E1cW9iQd?|y zWFgGfn|{I$M}eUU%J{0n@LS7pt29LlDMMZEWDHOB00^j8Ob3C9mjKWNWqj2lz&E8S z@<#z~??}S;>WxN6`ax@h=^Z4Yw}pFQK}rWJakH$<6-7JgV|}Man+z3%ef%v2zO;!|uO5M7{)t*sJ*R22GNebx_DYf>6ew z#!eig{)Ve%1YKPS{%8sEB|G`;Fxl5@>I2s%@01HD!8gH&kbp#?gyo4KKJutaodk3d z7JNSq!sphXJ^?*GlY{P{2I4GP-;u%rz`<_f=1y@5>s-(^M1za$$jHiwbArAyl4o|1 zD7yFiR8;kv6g3n_gESmeMi9za9!YURU5{Evbt=$c`3SmISF0gff;# zQk+odzzRcZoE9UsU#!#sZjVGJd+;j?jdyUYLd!<9PEA=iokwF%XY@_An(54T1fBI4 zl00-<#@M&m>E6o>S?OdfRVO(bWZ(=kBM4HI@#N;nnLh?KbwL-?U3{I;}4dMjZ)*6Sh|&-oMum|JE0egabm zh%iR`pp1Oc;SvY1Q6oj2Ns2zQ0LdL*Qh*ixMd02P0=`W}>-N43vQjNhfZ#-bsu#9-kBPs9qTVVcaF*4Gr uaS|@SUiCWx-9GA5py{t#L%wNLM!gOL>MsYXlAX95l$IdMi#e!AU;PXER$-<9 diff --git a/Source/Server/.Defs.h.un~ b/Source/Server/.Defs.h.un~ deleted file mode 100644 index 3463461fa9bc48977b48ec39fbc6da31004d112f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16246 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 M?Kzl#{@1Vn0X0r3Q~&?~ diff --git a/Source/Server/.FuncBuyZone.c.un~ b/Source/Server/.FuncBuyZone.c.un~ deleted file mode 100644 index 6a1aa2df96764ff246b10fe18380ebfb2245c79f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7599 zcmeI%O-oc^6bJC@_%e-|nU)HsU1*^~$zZe^j1UElDTl@pZ8K=z5nBnPq`Z}Js*CCyo!51Y^3xRU9bUSaY=CKS8JY#@=s3m#6zj6hj9%ypSf1N$&Hf(ZwQ zD#QrJ;+*07j>CZfcz_#8HG*PBv{m@DL$R8ddSTZJg*Tn}nR;*2cE zIV%pbqBfN(j)sbjT6uTd5aw61%L~Q%d`|hmm83hwd6*l=oNGcq!@OFeW;H`uwW@Opf5vo;+&t>)&o;7-53b<9LGk5X)9$a z&YA5xw;no118f~n?OGEqXLXMmVTOZ;Fz4C}RfrL6!#O*p#i{F0d!co-RfhgwohB8s=tsge8cGr) z_|3#QGu`1v0}Ys>Zm~@0Bv};Nn*mwm?wD*<+8yv%)8L$$^2~$|!Ga$Q+)emAU^Weq zfl1c*j!DbX=EyXhGt=h3m{O@!y}a299?i%fmm#Byo^3RU>3?}}o6y8@Zpnyh#0^&C zoCUW;uqS+N9dERuNU*eAoo}`tn5Bo6O1&WL{?7~u z$92OIML)`N;W_F1ZHJ8=4Z>;4H)E)%}C0(C<}fkpbkf?|>ytW;H5 z#>ZkgUg#TF>eAVo>g!up-a97UHHdlfCJqEvvf#4`>&o9)83J*d9bnByTMG!-MinBM zjKBdLm78M?pTqE$Qr1;y-^X-+7qIw+Pge|~EQg5y+JDj$vxG=FhYlXpd$%h zo6y}KMK_fdoTF2-OsvenXhXyiJ4V`IM-sd?v3u~(c3ACH;o*oIlbm2j61=v&9c82E zmnBno!)BLY?Nadp$-7x$33w#IYZJVOy6~tQ{dhOy@P<9y;We&8#F7hyfm0>L-)`QI z($R}6=}m9Q(h63)Rctt77v`EODgJiF?vbv&yj?oi%-PvBO{ff$4G%`>7<|L9NfNv^ zp?f@vF8u=V4_$>}v?}vW%LmsU6(N-HnQ9DAc`7qrc7^ZBC_a1F%NC>!U#$G_GLLmO zJS-{SaM!a5@w*Yfr`j(+Yq8}wxFl`M4=yuO+A!VPj48=betz*He&O&;^W~oy?4%{P q9&PP(*%2sjcE70zcRt^A*gZFPh4kkT?pt=Z96j`>FY~M4UjGKD=x0d) diff --git a/Source/Server/.Timer.c.un~ b/Source/Server/.Timer.c.un~ deleted file mode 100644 index 2c983472bc0083a7364c15b796467a84177cbb1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 964 zcmWH`%$*;a=aT=Ffr+#3?HuNR(WzGL(xL})#g{Jl*(3J+;>4%QYZX?8u2sloU|?Vd zVh~`0Pz;PnY>*fXGep=`GqQkW85!a)Ko!F@fw&MUsKkFDfEx`J8>Ofj0ugpqAHmVV z!0=T9&0tVeKt#bTn5=0dIO0&mfO7B{2B`x_9J&ga0i!e(LI9YL7@+wG9C4t)24zAJ L1_!)p_StW~CM|FfbSc zu_|YAYDsQ>N@|XRMsaFRnvQ}}K~a8sv3@~LVr6QPUT#W`lBP9Kp%xGe0Wl*K11UHg zB*qY7Z7je7k&V9q5B~5FfLTMnD17b!XW(Hyq z0MRha5MgcfhXo|d#1MZ0Bnt#g5DH9!q+o_H{09QCQAi3#nbZscV01hMM+XDLR|%lO zQa~&N#GptAMFnvYZ`ufsOXNrg>IKIuC@v*IoYA-hg#s-BFfPC2i%SK}ObpJ<#rn|v z3r+!`2!o{n257`0XHbw2K)D&DP63EVBNh}0GzGwj{S7TMv1U?poDmC+Uq~sfpOcze N0w$pGZQA&J6#xpnZj%52 diff --git a/Source/Server/.progs.src.un~ b/Source/Server/.progs.src.un~ deleted file mode 100644 index b7cdb6ed6b9561b9e96d90c294e4ea40003547c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12762 zcmeI3ONbm*6ozXi^Xf5^hZ^G}I8AyJH{Aw|NQNG^3}!nY8#*Ydi&0YZ_n*tzVc`D{%=!XL{YRy zlG%)8CL|ql1$awQ)onkOSM}0t$uH_-zzW0?bgwc6k~?WtAnz6jsr%gN?}eg zmKEc~Xp9xXn3E**r@V#|h>%nZBu$B;e4~Es%y2-0zyi{de6txRkBdoeoA%lX)j-k{ zq}Z>pA`xaLpM8?Qj8NrIG7Q0mUF{2E+i))F|8wxYrci`@rfGdLR4rtmgv>z2cz_8Rv{1V_v!2zqHlq_u{10mGiS}{bWVX zJDSidNiw6F>~{lAlVwbwhvxNRnjj%Dehtxrj;;^HV~`89REq!LuROGF4AZjiP-h!1 zsKD}s*C3E_9aO{84iR=@c`$wIW8wy+CwfK%6?Aq>GJ~AOU!Y~GjO+8z`pl4s}?|;5=D6d{k0#i!>flBKeJLI zpCC?4plltnKURWoFIPDOEq8^uHAM>bg7c1#Q-Qf(R7@JK3d7o=C3FI2gYoUc6ps7s z3h^-J8BhyhYDyI4h3j`dR~QkhkR+dHQ&d62%x<(U7?%4bnZcRso}?hKMTH{macqxP zHn*DV8_lx5fm)U~P`s0pKY6ymVW}M5zW~m#J;HHdiwZliOi8JO{Bc(o^QhO!3)}A> z6}NiB!)(ikbI_%3*E2)(DUO{%J8M@UY_g2$GbNp>xd}7!(lZ~)OW5HA-_w%JKuaUk z0!~w6OplT;xqCBJ<=Eek{b5wVGC>08?n<1jwEL^AcHHghh-yPIz_t3kzz+{s=biwF zACP3m)4-3Yg(tw27}Mu@0)F(L0DgxVlRW`@D)K@_cHhebFTsHH43|0sV1Q<7?9`*b zg)MnAKWu**1NVm5G$bj~WLEo&LYq#Z5ie{8vGopuiHaM_;PRX#Gnhe^6jmRI zP^bx~-<8u$%87mtM#kyEF0SJRpXa?M!H&IM-H8uz1WeUkQ>f7lD9CL#)#(NDNjG<2t?E<+#2=2zSKZ0J%9=*gSxOJU)`MSUwOBav@&LX i5Yj^Ug+N4!|Hb70RlK6i=2K>@*9b5|W+1@+xb-h`jpxw- diff --git a/Source/Server/Input.c b/Source/Server/Input.c index 565d7387..7cc2d209 100644 --- a/Source/Server/Input.c +++ b/Source/Server/Input.c @@ -28,12 +28,22 @@ void Input_Handle( void ) { Weapon_SecondaryAttack( self.weapon ); } - /*if( self.impulse == 10 ) { - self.weapon++; - } - if( self.impulse == 11 ) { - self.weapon--; - } - - self.impulse = 0; */ + if ( cvar( "developer" ) == 1 ) { + if( self.impulse == 10 ) { + if ( self.weapon < ( CS_WEAPON_COUNT - 1 ) ) { + dprint( "Weapon Cheat +\n" ); + self.weapon++; + CSEv_GamePlayerBuy_f( self.weapon ); + } + } + if( self.impulse == 11 ) { + if ( self.weapon > 1 ) { + dprint( "Weapon Cheat -\n" ); + self.weapon--; + CSEv_GamePlayerBuy_f( self.weapon ); + } + } + } + + self.impulse = 0; } diff --git a/Source/Shared/WeaponAK47.c b/Source/Shared/WeaponAK47.c index 49f84603..0e8b7b27 100644 --- a/Source/Shared/WeaponAK47.c +++ b/Source/Shared/WeaponAK47.c @@ -35,7 +35,7 @@ weaponinfo_t wptAK47 = { 0.98, // Range Modifier TYPE_AUTO, 0.1, // Attack-Delay - 3.0, // Reload-Delay + 2.4, // Reload-Delay iAmmo_762MM, // Caliber Pointer iClip_AK47 // Clip Pointer }; diff --git a/Source/Shared/WeaponAUG.c b/Source/Shared/WeaponAUG.c index 0e1f4b98..221b8d43 100644 --- a/Source/Shared/WeaponAUG.c +++ b/Source/Shared/WeaponAUG.c @@ -35,7 +35,7 @@ weaponinfo_t wptAUG = { 0.96, // Range Modifier TYPE_AUTO, 0.09, // Attack-Delay - 3.0, // Reload-Delay + 3.3, // Reload-Delay iAmmo_762MM, // Caliber Pointer iClip_AUG // Clip Pointer }; diff --git a/Source/Shared/WeaponAWP.c b/Source/Shared/WeaponAWP.c index 531faa4d..dc6ed782 100644 --- a/Source/Shared/WeaponAWP.c +++ b/Source/Shared/WeaponAWP.c @@ -34,8 +34,8 @@ weaponinfo_t wptAWP = { 8192, // Bullet Range 0.99, // Range Modifier TYPE_AUTO, - 1.5, // Attack-Delay - 3.0, // Reload-Delay + 1.2, // Attack-Delay + 2.9, // Reload-Delay iAmmo_338MAG, // Caliber Pointer iClip_AWP // Clip Pointer }; diff --git a/Source/Shared/WeaponDeagle.c b/Source/Shared/WeaponDeagle.c index 111bb0af..395f24aa 100644 --- a/Source/Shared/WeaponDeagle.c +++ b/Source/Shared/WeaponDeagle.c @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. weaponinfo_t wptDEAGLE = { WEAPON_DEAGLE, // Identifier SLOT_SECONDARY, - 3500, // Price + 650, // Price CALIBER_50AE, // Caliber ID 650, // Max Player Speed 1, // Bullets Per Shot @@ -35,7 +35,7 @@ weaponinfo_t wptDEAGLE = { 0.81, // Range Modifier TYPE_SEMI, 0.15, // Attack-Delay - 3.0, // Reload-Delay + 2.1, // Reload-Delay iAmmo_50AE, // Caliber Pointer iClip_DEAGLE // Clip Pointer }; diff --git a/Source/Shared/WeaponElites.c b/Source/Shared/WeaponElites.c index 14a3d095..62cfebb2 100644 --- a/Source/Shared/WeaponElites.c +++ b/Source/Shared/WeaponElites.c @@ -20,6 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. .int iClip_ELITES; +#ifdef QWSSQC +.int iMode_ELITES; +#else +int iWeaponMode_ELITES; +#endif + // Weapon Info weaponinfo_t wptELITES = { WEAPON_ELITES, // Identifier @@ -35,7 +41,93 @@ weaponinfo_t wptELITES = { 0.75, // Range Modifier TYPE_SEMI, 0.15, // Attack-Delay - 3.0, // Reload-Delay + 4.6, // Reload-Delay iAmmo_9MM, // Caliber Pointer iClip_ELITES // Clip Pointer }; + +// Anim Table +enum { + ANIM_ELITES_IDLE, + ANIM_ELITES_IDLE_LEFTEMPTY, + ANIM_ELITES_SHOOT_LEFT1, + ANIM_ELITES_SHOOT_LEFT2, + ANIM_ELITES_SHOOT_LEFT3, + ANIM_ELITES_SHOOT_LEFT4, + ANIM_ELITES_SHOOT_LEFT5, + ANIM_ELITES_SHOOT_LEFTLAST, + ANIM_ELITES_SHOOT_RIGHT1, + ANIM_ELITES_SHOOT_RIGHT2, + ANIM_ELITES_SHOOT_RIGHT3, + ANIM_ELITES_SHOOT_RIGHT4, + ANIM_ELITES_SHOOT_RIGHT5, + ANIM_ELITES_SHOOT_RIGHTLAST, + ANIM_ELITES_RELOAD, + ANIM_ELITES_DRAW +}; + +void WeaponELITES_Draw( void ) { +#ifdef QWSSQC + OpenCSGunBase_Draw(); + sound( self, CHAN_WEAPON, "weapons/elite_deploy.wav", 1, ATTN_IDLE ); // TODO: Move to the client...? +#else + View_PlayAnimation( ANIM_ELITES_DRAW ); +#endif +} + +void WeaponELITES_PrimaryFire( void ) { +#ifdef QWSSQC + if ( OpenCSGunBase_PrimaryFire() == TRUE ) { + // Play Sound + sound( self, CHAN_WEAPON, "weapons/elite_fire.wav", 1, ATTN_NORM ); + } +#else + int iRand = ceil( random() * 5 ); + if ( iWeaponMode_ELITES == 0 ) { + if ( getstatf( STAT_CURRENT_CLIP ) == 1 ) { + View_PlayAnimation( ANIM_ELITES_SHOOT_LEFTLAST ); + } else { + if ( iRand == 1 ) { + View_PlayAnimation( ANIM_ELITES_SHOOT_LEFT1 ); + } else if ( iRand == 2 ) { + View_PlayAnimation( ANIM_ELITES_SHOOT_LEFT2 ); + } else if ( iRand == 3 ) { + View_PlayAnimation( ANIM_ELITES_SHOOT_LEFT3 ); + } else if ( iRand == 4 ) { + View_PlayAnimation( ANIM_ELITES_SHOOT_LEFT4 ); + } else { + View_PlayAnimation( ANIM_ELITES_SHOOT_LEFT5 ); + } + } + } else { + if ( getstatf( STAT_CURRENT_CLIP ) == 0 ) { + View_PlayAnimation( ANIM_ELITES_SHOOT_RIGHTLAST ); + } else { + if ( iRand == 1 ) { + View_PlayAnimation( ANIM_ELITES_SHOOT_RIGHT1 ); + } else if ( iRand == 2 ) { + View_PlayAnimation( ANIM_ELITES_SHOOT_RIGHT2 ); + } else if ( iRand == 3 ) { + View_PlayAnimation( ANIM_ELITES_SHOOT_RIGHT3 ); + } else if ( iRand == 4 ) { + View_PlayAnimation( ANIM_ELITES_SHOOT_RIGHT4 ); + } else { + View_PlayAnimation( ANIM_ELITES_SHOOT_RIGHT5 ); + } + } + } + + iWeaponMode_ELITES = 1 - iWeaponMode_ELITES; +#endif +} + +void WeaponELITES_Reload( void ) { +#ifdef QWSSQC + if ( OpenCSGunBase_Reload() == TRUE ) { + // Play Sound + } +#else + View_PlayAnimation( ANIM_ELITES_RELOAD ); + iWeaponMode_ELITES = 0; +#endif +} diff --git a/Source/Shared/WeaponFiveSeven.c b/Source/Shared/WeaponFiveSeven.c index 0e54c3b0..9d8030e9 100644 --- a/Source/Shared/WeaponFiveSeven.c +++ b/Source/Shared/WeaponFiveSeven.c @@ -35,7 +35,7 @@ weaponinfo_t wptFIVESEVEN = { 0.885, // Range Modifier TYPE_SEMI, 0.15, // Attack-Delay - 3.0, // Reload-Delay + 3.1, // Reload-Delay iAmmo_57MM, // Caliber Pointer iClip_FIVESEVEN // Clip Pointer }; diff --git a/Source/Shared/WeaponG3SG1.c b/Source/Shared/WeaponG3SG1.c index 4795015d..17a0a946 100644 --- a/Source/Shared/WeaponG3SG1.c +++ b/Source/Shared/WeaponG3SG1.c @@ -35,7 +35,7 @@ weaponinfo_t wptG3SG1 = { 0.98, // Range Modifier TYPE_AUTO, 0.25, // Attack-Delay - 3.0, // Reload-Delay + 4.6, // Reload-Delay iAmmo_762MM, // Caliber Pointer iClip_G3SG1 // Clip Pointer }; diff --git a/Source/Shared/WeaponGlock18.c b/Source/Shared/WeaponGlock18.c index 92844493..2201fd3f 100644 --- a/Source/Shared/WeaponGlock18.c +++ b/Source/Shared/WeaponGlock18.c @@ -41,7 +41,7 @@ weaponinfo_t wptGLOCK18 = { 0.75, // Range Modifier TYPE_SEMI, 0.15, // Attack-Delay - 3.0, // Reload-Delay + 2.0, // Reload-Delay iAmmo_9MM, // Caliber Pointer iClip_GLOCK18 // Clip Pointer }; diff --git a/Source/Shared/WeaponM4A1.c b/Source/Shared/WeaponM4A1.c index d543e3f7..b37c30ec 100644 --- a/Source/Shared/WeaponM4A1.c +++ b/Source/Shared/WeaponM4A1.c @@ -41,7 +41,7 @@ weaponinfo_t wptM4A1 = { 0.97, // Range Modifier TYPE_AUTO, 0.09, // Attack-Delay - 3.0, // Reload-Delay + 3.1, // Reload-Delay iAmmo_556MM, // Caliber Pointer iClip_M4A1 // Clip Pointer }; diff --git a/Source/Shared/WeaponMP5.c b/Source/Shared/WeaponMP5.c index c55629d4..19cce8c3 100644 --- a/Source/Shared/WeaponMP5.c +++ b/Source/Shared/WeaponMP5.c @@ -35,7 +35,7 @@ weaponinfo_t wptMP5 = { 0.84, // Range Modifier TYPE_AUTO, 0.08, // Attack-Delay - 3.0, // Reload-Delay + 2.6, // Reload-Delay iAmmo_9MM, // Caliber Pointer iClip_MP5 // Clip Pointer }; diff --git a/Source/Shared/WeaponMac10.c b/Source/Shared/WeaponMac10.c index e2ecd511..1a066ac6 100644 --- a/Source/Shared/WeaponMac10.c +++ b/Source/Shared/WeaponMac10.c @@ -35,7 +35,7 @@ weaponinfo_t wptMAC10 = { 0.82, // Range Modifier TYPE_AUTO, 0.075, // Attack-Delay - 3.0, // Reload-Delay + 3.2, // Reload-Delay iAmmo_45ACP, // Caliber Pointer iClip_MAC10 // Clip Pointer }; diff --git a/Source/Shared/WeaponP228.c b/Source/Shared/WeaponP228.c index 55d719f6..eab914a5 100644 --- a/Source/Shared/WeaponP228.c +++ b/Source/Shared/WeaponP228.c @@ -35,7 +35,7 @@ weaponinfo_t wptP228 = { 0.8, // Range Modifier TYPE_SEMI, 0.15, // Attack-Delay - 3.0, // Reload-Delay + 2.7, // Reload-Delay iAmmo_357SIG, // Caliber Pointer iClip_P228 // Clip Pointer }; diff --git a/Source/Shared/WeaponP90.c b/Source/Shared/WeaponP90.c index ed97b6f8..aa668886 100644 --- a/Source/Shared/WeaponP90.c +++ b/Source/Shared/WeaponP90.c @@ -35,7 +35,7 @@ weaponinfo_t wptP90 = { 0.84, // Range Modifier TYPE_AUTO, 0.07, // Attack-Delay - 3.0, // Reload-Delay + 3.3, // Reload-Delay iAmmo_57MM, // Caliber Pointer iClip_P90 // Clip Pointer }; diff --git a/Source/Shared/WeaponSG550.c b/Source/Shared/WeaponSG550.c index 185a86d2..48401b8b 100644 --- a/Source/Shared/WeaponSG550.c +++ b/Source/Shared/WeaponSG550.c @@ -35,7 +35,7 @@ weaponinfo_t wptSG550 = { 0.98, // Range Modifier TYPE_AUTO, 0.25, // Attack-Delay - 3.0, // Reload-Delay + 3.8, // Reload-Delay iAmmo_556MM, // Caliber Pointer iClip_SG550 // Clip Pointer }; diff --git a/Source/Shared/WeaponSG552.c b/Source/Shared/WeaponSG552.c index 8cb5ced4..367671e3 100644 --- a/Source/Shared/WeaponSG552.c +++ b/Source/Shared/WeaponSG552.c @@ -35,7 +35,7 @@ weaponinfo_t wptSG552 = { 0.955, // Range Modifier TYPE_AUTO, 0.09, // Attack-Delay - 3.0, // Reload-Delay + 3.2, // Reload-Delay iAmmo_556MM, // Caliber Pointer iClip_SG552 // Clip Pointer }; diff --git a/Source/Shared/WeaponScout.c b/Source/Shared/WeaponScout.c index 59f86ed7..1ab10d67 100644 --- a/Source/Shared/WeaponScout.c +++ b/Source/Shared/WeaponScout.c @@ -35,7 +35,7 @@ weaponinfo_t wptSCOUT = { 0.98, // Range Modifier TYPE_AUTO, 1.25, // Attack-Delay - 3.0, // Reload-Delay + 2.0, // Reload-Delay iAmmo_762MM, // Caliber Pointer iClip_SCOUT // Clip Pointer }; diff --git a/Source/Shared/WeaponTMP.c b/Source/Shared/WeaponTMP.c index facb0535..68b335fc 100644 --- a/Source/Shared/WeaponTMP.c +++ b/Source/Shared/WeaponTMP.c @@ -35,7 +35,7 @@ weaponinfo_t wptTMP = { 0.84, // Range Modifier TYPE_AUTO, 0.07, // Attack-Delay - 3.0, // Reload-Delay + 2.1, // Reload-Delay iAmmo_9MM, // Caliber Pointer iClip_TMP // Clip Pointer }; diff --git a/Source/Shared/WeaponUMP45.c b/Source/Shared/WeaponUMP45.c index c33983ed..2859a14e 100644 --- a/Source/Shared/WeaponUMP45.c +++ b/Source/Shared/WeaponUMP45.c @@ -35,7 +35,7 @@ weaponinfo_t wptUMP45 = { 0.82, // Range Modifier TYPE_AUTO, 0.105, // Attack-Delay - 3.0, // Reload-Delay + 3.5, // Reload-Delay iAmmo_45ACP, // Caliber Pointer iClip_UMP45 // Clip Pointer }; diff --git a/Source/Shared/WeaponUSP45.c b/Source/Shared/WeaponUSP45.c index 538177ae..e31ffab6 100644 --- a/Source/Shared/WeaponUSP45.c +++ b/Source/Shared/WeaponUSP45.c @@ -41,7 +41,7 @@ weaponinfo_t wptUSP45 = { 0.79, // Range Modifier TYPE_SEMI, 0.15, // Attack-Delay - 3.0, // Reload-Delay + 2.5, // Reload-Delay iAmmo_45ACP, // Caliber Pointer iClip_USP45 // Clip Pointer }; diff --git a/Source/Shared/Weapons.c b/Source/Shared/Weapons.c index 92a452ac..abb1ff20 100644 --- a/Source/Shared/Weapons.c +++ b/Source/Shared/Weapons.c @@ -27,7 +27,7 @@ weaponfunc_t wpnFuncTable[ CS_WEAPON_COUNT ] = { { WeaponGLOCK18_Draw, WeaponGLOCK18_PrimaryFire, WeaponGLOCK18_Secondary, WeaponGLOCK18_Reload }, { WeaponDEAGLE_Draw, WeaponDEAGLE_PrimaryFire, Temp_Nothing, WeaponDEAGLE_Reload }, { WeaponP228_Draw, WeaponP228_PrimaryFire, Temp_Nothing, WeaponP228_Reload }, - { WeaponUSP45_Draw, WeaponUSP45_PrimaryFire, Temp_Nothing, WeaponUSP45_Reload }, + { WeaponELITES_Draw, WeaponELITES_PrimaryFire, Temp_Nothing, WeaponELITES_Reload }, { WeaponFIVESEVEN_Draw, WeaponFIVESEVEN_PrimaryFire, Temp_Nothing, WeaponFIVESEVEN_Reload }, #ifdef QWSSQC { WeaponM3_Draw, WeaponM3_PrimaryFire, Temp_Nothing, WeaponM3_Reload }, @@ -43,7 +43,7 @@ weaponfunc_t wpnFuncTable[ CS_WEAPON_COUNT ] = { { WeaponTMP_Draw, WeaponTMP_PrimaryFire, Temp_Nothing, WeaponTMP_Reload }, { WeaponAK47_Draw, WeaponAK47_PrimaryFire, Temp_Nothing, WeaponAK47_Reload }, { WeaponSG552_Draw, WeaponSG552_PrimaryFire, Temp_Nothing, WeaponSG552_Reload }, - { WeaponM4A1_Draw, WeaponM4A1_PrimaryFire, Temp_Nothing, WeaponM4A1_Reload }, + { WeaponM4A1_Draw, WeaponM4A1_PrimaryFire, WeaponM4A1_Secondary, WeaponM4A1_Reload }, { WeaponAUG_Draw, WeaponAUG_PrimaryFire, Temp_Nothing, WeaponAUG_Reload }, { WeaponSCOUT_Draw, WeaponSCOUT_PrimaryFire, Temp_Nothing, WeaponSCOUT_Reload }, { WeaponAWP_Draw, WeaponAWP_PrimaryFire, Temp_Nothing, WeaponAWP_Reload }, @@ -87,7 +87,6 @@ void Weapon_Reload( float fWeapon ) { } #ifdef QWSSQC - void Weapon_UpdateCurrents( void ) { self.iCurrentClip = self.(wptTable[ self.weapon ].iClipfld); self.iCurrentCaliber = self.(wptTable[ self.weapon ].iCaliberfld); @@ -129,5 +128,4 @@ void CSEv_GamePlayerBuy_f( float fWeapon ) { self.fMoney -= wptTable[ fWeapon ].iPrice; self.fAttackFinished = time + 1.0; } - #endif