From 53f285dcb635219a974da468e14d97942d03d895 Mon Sep 17 00:00:00 2001
From: hamstar0 <webutek@gmail.com>
Date: Sun, 24 May 2020 05:25:36 -0700
Subject: [PATCH] v1.2.0 - Missed a spot

---
 .../Definitions/HologramDefinition_Draw.cs    |   2 +-
 Emitters/Effects/ScanlinesCRT.xnb             | Bin 1864 -> 2228 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emitters/Definitions/HologramDefinition_Draw.cs b/Emitters/Definitions/HologramDefinition_Draw.cs
index 10743a1..dbdb405 100644
--- a/Emitters/Definitions/HologramDefinition_Draw.cs
+++ b/Emitters/Definitions/HologramDefinition_Draw.cs
@@ -98,7 +98,7 @@ public void CRTEffectBegin() {
 			fx.Parameters["Frame"].SetValue( (float)this.CurrentFrame );
 			fx.Parameters["FrameMax"].SetValue( (float)Main.npcFrameCount[this.Type.Type] );
 
-			fx.Parameters["UserColor"].SetValue( this.Color.ToVector4() );
+			fx.Parameters["UserColor"].SetValue( color.ToVector4() );
 
 			Main.spriteBatch.End();
 			/*Main.spriteBatch.Begin(
diff --git a/Emitters/Effects/ScanlinesCRT.xnb b/Emitters/Effects/ScanlinesCRT.xnb
index e66c695fa20b480fe77f653828e1f2521ca6b3e7..51166cc48edd538f68eeab7c91ac0080cff96165 100644
GIT binary patch
delta 753
zcma)3&r2Io5T3WYZ?iT=(;w1Cgjf|t5UTW4EOa$!TTrnOLC}M(1Pw&Drj+(jF!t1g
zP-QNKddQ&%1rG`ym3mY`1lvC$J@r!WlI=I!joqWOeDBSCGxNRoW{(>7ZaR}=gYUH3
zbJm@WRJ}uV7XP!Kr2nSs{ObPt!MrlKQ+=${$Yk>iIpST_&YS9va``}YG=nw)1$>Yt
zG>eFr&8EZ+#1n6F#f(?*ikvXoZc!XmHa9!Jm|uFE>mzb_!0?7z(fl|fFb=;EiMK;v
zwr>%i!vojAt@1A;y*wjVHGIG7Kch@`V6X+@Z>a)@YmvmT)(VyaVBi5F_#XHKd;w}t
z+JP^22pIUHbteI51>8^g(mPyy$(}itx_UCQqW-T61$=BiGOPX$$E=6lD(Ia7{Te6%
zwKG;jZX@7`XRRNxHp+}V&n9`ryvu8*a}8JzF1IeuM_-M9hYXSX*$wu{QuSRLo*c>8
z;1u=pSDofX-OSS(`uZOCXeS;E>lL}|>86y-pg!azCo@HFQt^_$-6xFv095tL6vb*)
zHDB^#qLkocola?LEMo#sK)ApmKrbL<v$E%u=DgjnamTXFTXtG&nkZ{NwV$>_sSMzt
T#u8DbWKrcRhPrUv6}$fzIAeNW

delta 471
zcmYL_ze~eF6vy8scS)qJt!>d3geZtobZJEpMC>p80Ywy2=pqOjtczAqI*CCX92{)l
z+99J*M{#PwMR0S_O>puLaCAz1XRCh0CwK45`#$dOZs=*ysI2Gfg01Qeqm^_ufakzx
zCj$Rs1HR`px>W`^$<FbW#j(Q@O(hh}#BH_TSHvzG!5bFDl43?f0kSQ7r+Tn|bYiCg
zbUalK=O!3HmiSezzn2S*|B+m<w*`xe4NR-1o#kXHzVG>qP_T0OQ7XH#i#&M*S(C=@
z=~p2XP(e=GC60*;LiS0oMM&Ke3VnZl7!qbvMDR<^V3E&@cH8soc*bW_z2G(lYJ@|`
zm<(PK(vw4J7{2kBm;!~;nneb9{uC@%N(GKNEyg&OwQ0N-23~3jw6rL`Yr{CBCz2e(
zF3nw{NS1gYU=u(H+|u_b_oy!j0pJQ0hAB9dU5+VZB}T8}l211aI{+UJoe0qw{{|r)
BROA2v