From 6c3c7dc381ffd77cb42563f1152e20399520773e Mon Sep 17 00:00:00 2001
From: eukara <marco@icculus.org>
Date: Sun, 19 Nov 2017 20:39:25 -0600
Subject: [PATCH] Changed dlight positions a little, since the seat/splitscreen
 stuff changed the view viewmodels are positioned.s

---
 Source/Client/Nightvision.c |   2 +-
 Source/Client/View.c        |   4 ++--
 Source/Shared/Weapons.c     |   1 +
 freecs/csprogs.dat          | Bin 189186 -> 189186 bytes
 freecs/progs.dat            | Bin 184146 -> 184162 bytes
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/Client/Nightvision.c b/Source/Client/Nightvision.c
index 8d507b07..551818f0 100755
--- a/Source/Client/Nightvision.c
+++ b/Source/Client/Nightvision.c
@@ -59,7 +59,7 @@ void Nightvision_PreDraw( void ) {
 	}
 	
 	if ( iNightVision == TRUE ) {
-		dynamiclight_add( getproperty( VF_ORIGIN ), 500, '0 0.45 0');
+		dynamiclight_add( pSeat->vPlayerOrigin, 500, '0 0.45 0');
 	}
 }
 
diff --git a/Source/Client/View.c b/Source/Client/View.c
index 991c1462..febc098f 100755
--- a/Source/Client/View.c
+++ b/Source/Client/View.c
@@ -144,7 +144,7 @@ void View_DrawViewModel( void ) {
 	}
 
 	// Don't update when paused
-	if ( serverkey("pausestate") == "0" ) {
+	if ( serverkey( "pausestate" ) == "0" ) {
 		View_CalcBob();
 
 		int aw = getstati( STAT_ACTIVEWEAPON );
@@ -197,7 +197,7 @@ void View_DrawViewModel( void ) {
 		// Update muzzleflash position and draw it
 		if ( eMuzzleflash.alpha > 0.0f ) {
 			eMuzzleflash.origin = gettaginfo( eViewModel, eMuzzleflash.skin );
-			dynamiclight_add( eMuzzleflash.origin, 400 * eMuzzleflash.alpha, '1 0.45 0');
+			dynamiclight_add( pSeat->vPlayerOrigin, 400 * eMuzzleflash.alpha, '1 0.45 0');
 			addentity( eMuzzleflash );
 		}
 		
diff --git a/Source/Shared/Weapons.c b/Source/Shared/Weapons.c
index c010782f..26990d72 100755
--- a/Source/Shared/Weapons.c
+++ b/Source/Shared/Weapons.c
@@ -173,6 +173,7 @@ void Weapon_Reload( float fWeapon ) {
 	if ( self.fAttackFinished > time ) {
 		return;
 	}
+	self.viewzoom = 1.0;
 #endif
 #ifdef CSQC
 	if ( fWeaponEventPlayer != player_localentnum || autocvar_cl_thirdperson == TRUE ) {
diff --git a/freecs/csprogs.dat b/freecs/csprogs.dat
index 95caaa90366ef4f3b30486208783305fe1b826ea..1e457d6115e47e7836ab9fc47ee9f6fe6c072d41 100644
GIT binary patch
delta 56
zcmZoV#@%#`yI~8XfEVj*25qKi+eN(?Uu%nj*$fBx6c`?Ia4|42WHYER9^h*iD`VU)
JR>t%u2LShZ5Xt}m

delta 56
zcmZoV#@%#`yI~8XfETMIgAs4Uc2O_J*V<y43>u8f85kH87#?zP0qJZ86-GvecCj+X
K?P6t2Z*l;k(+#`;

diff --git a/freecs/progs.dat b/freecs/progs.dat
index ab06f2f4a3c7238809980387c6ed655071c33356..cce683fb47a261bfb3d19cd7ab089acc90719019 100644
GIT binary patch
delta 1618
zcmWmFZ%oxy9LMqB?-!`Zs36eDC@+Y1kw0D)1Fj%EU}k|EHC*U)VKT-B6-}IM(ZWTE
z8!9?@4-1Pewn(YrV#3_5v1E-UGBTF5*rG|rh>Fq&tgh?(d2(LgeRdw4v-3UYe0wqa
z=Zn#Sm5$?VTI)DD6Q<8`elPT#2cjJ(qRVp%T*rCsw(I=rInG&|_wh}~x!WFi#4Twq
z9xQeje0+G!jaWVJtc*@|7HxbtGub6G+3R$x8BO+5+*g<v4aB4vZx9e?C>NbHiqGg4
zql}0jnG=5!wZRCGA@V5`yJ--o=n{j3#1OOMHzHGwMf~C(rQ$yIB8m?2Aj4t}Ga?0d
zqme_Z2(w2dQYU=0i_Hv*ex}71!Xk)olTkvksHH|6r%l8&AoemPs#z9SNP5Z`qDb7L
zN<2iXh@)RT#-upPJ#mIaztKa!_=HMvjTW(rKCy;zv4JI#MnakqBv<U?ptwV`SfE!t
z!I;QpQIrt7+1N+6I6#GXohEUT9&wIQ(aXH}oS1YYL_qvPx%i7lv4U<9$B0<VoLEOx
zhVdjBBAqf3q(SVaOY9>gDwq|uL}nVV;ups$6_=?OU(g}GWLR8hMtqH%Wh9bnP@CmF
z%!^rGyzR73`6k+x-&THIc^cEoa|ny)@NF^d6vYeFh#J~NEd%0Bro;)B#XBSgjMEf}
zkEjwuw2B4##lK97F!#hZ61N)L$rq(miZWV6IensvadDI-@iqzDj4pD;RSt?Vn#B+F
ziu;U-I2OgD#BMh>k}dM65PNA7hv^Z=7!@a&7iWpdHZBklS11?LG>WZsi)R=S&od{E
z5Vga2iwyArWulJ;ag8qV2O$y3tVk#FX`>jwI83QHMZLI0hZts9e8Y^G#LY2cNfp`b
z5&6`K{j`ft2F0gLix6QkfiKsXqFDH-5nE^zhZqpmOo{hd7MDoMGX^LUUr{A)&?;u>
zH@KT;z4B9@7thY1RS`j}UJ7~<JRbDcyZ?|Mw7GYw6f0>F`{@%eGcJy>Bu<jB)9{lk
zp5>r8K(qLpUa^WX5znFs5Swq<brh{si1RdwPI|<9jEbAgi~oozFm@0ShbR~JoEqFI
zu(e+<u#OKiqWnH{hUczl^)4^j^~l&|={d^87!BeEUE&rY@g1|`dm;;s+xW!-rNX0L
V#L*$vT^%m;&YxaUGGRZ2^FPqRv=jgU

delta 1596
zcmWmFaY)={9LMqJcbg6|Ntb4hM9%Hz&Qf>Vbl&tfB`$Jpl;lW3K^I3T3Au7$w3w0G
zggKOy_Y7QENV`fl7dnpRA67DMWO55@MpBMh$TDUn<W%bU{Plu2&wtPNdA@fqCEmW2
z=-Xn9$w@b+c-k0`+nArrTxL_EG5=h2nS+io^>-ZeyUUnvd+zdg#@y@iJ?50Q2S<a>
zefQb2Y=^RJSFaOdCfl{$d5u-^2ASI}Z&5C~2#H=g#W2I-YhvOjR>Tq+J1hkRL<tQd
zNQXE_SbV{h7-L!dMw-WRAHVpUI<Zc>*us!_gs4bmNw`VbX(^&mtWhJ<IVG|f6kaC9
zXDo_*l5#A5eBv<2L=$b|Bm-hA6XFO9B1FP2%T@Bk7?mPMt4N|>Br`6aU|yUc&THwy
zD?a3?xJ-+P&?n-Fh*ai8HcqZ(7arlKLR8T#?$RR`85K`5EB3P?4&#2xQbkbI&?sJ~
zOPpaubTcD9W>s7x^J&Ws%EdiG;!iroW`;#FF_FfK$RH!nl1V`1(jfeFh#+B6#gurN
zWzj@hzNHzzI7yxOly>nYLt>n$_=+VlNlJkwokFpV8Vl70u4K*^xKbStgX%k(RR2c(
zU-crAcH3ToPuN=&m9&Xh84yiOh__h~r%CWx-Xl+(r&4@Gs~DqSEHW-unHOus?Xmdq
ziai_^&(k7apijI+M7+YBIDxa*@-7|$6=IZTag!c#hf%T4tVm`<JdS&xWd}h~OrtnL
zm#Ak%yvd9>&8oOSW})RG<>D$K@gtpLH^bstV&X+s#Bnl;EbkBy12l+F=nxUY;t!_8
zCYD7mY5OhD;1~7OiF34zFhk-xQ4wWHOp{V<d6Yu2ml{#RDN)U!=w(uT&Z4+MlHW3g
zPkhfYkwu%xXF$|4Awn#O4@fv*36m$TP$?#86}RXYzc4PAn78oj0Xr+HC3aRG;4QIX
zbBPVL3V+dJgA+%es3syBm=niwN-bybh#V@!b2N(@dc*@pMLe@&D;uH!cfexbqBu*V
z=%GvWG9vn!5#O>Z9+G*`vX636OGwziR6Jx@tPvCItXN$CWwGs$E88&y4%ymGgSbhD
qxJ6jRm=d>H7Bi%kS$@DT7O4}4c9G1G$haOYbG?5dzI58|0`osp)UhuB