From 3e6727ce0dd0d97e41597473158ed29caad65301 Mon Sep 17 00:00:00 2001 From: fruitiex Date: Wed, 16 Sep 2009 13:06:43 +0000 Subject: [PATCH] CTF status change ping git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7817 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/gfx/hud/sb_flag_blue_carrying.tga | Bin 7532 -> 7629 bytes data/gfx/hud/sb_flag_blue_lost.tga | Bin 6460 -> 6452 bytes data/gfx/hud/sb_flag_blue_shielded.tga | Bin 7719 -> 7816 bytes data/gfx/hud/sb_flag_blue_taken.tga | Bin 8334 -> 8442 bytes data/gfx/hud/sb_flag_red_carrying.tga | Bin 7759 -> 7855 bytes data/gfx/hud/sb_flag_red_lost.tga | Bin 6144 -> 6097 bytes data/gfx/hud/sb_flag_red_shielded.tga | Bin 8046 -> 7972 bytes data/gfx/hud/sb_flag_red_taken.tga | Bin 8073 -> 8168 bytes data/qcsrc/client/sbar.qc | 104 +++++++++++++++++++------ 9 files changed, 82 insertions(+), 22 deletions(-) diff --git a/data/gfx/hud/sb_flag_blue_carrying.tga b/data/gfx/hud/sb_flag_blue_carrying.tga index 1f3cfdf83293d7b09294f9baa06b0bd9b42e612f..fbce8b51f5dcc1009802fa7ec0bb55136db85445 100755 GIT binary patch delta 661 zcmYk)&o5(96bEn*J^iUwtts^+l#Ly+t5{gfVrDVI!feI_i%AHvkVu4}ewVhd*SGB; z8o@M^8L`2N#F|N1qYJCqS@{Qex7TUB~eoK?SJ+p z_?COm0duA@%WU@kVqSZ9nLn!bnB+5<8Q(HLO7};tg;#Hs;K&~V HTOWJ{4hE*e delta 563 zcmXw$&r4fD5XaqECz_Z%WBie5BHD^KK@dSy=vlFp_7G1!^r#>e1fd6Q6Z7N6HBa9}O=Q$p+7Qja=d!3In#P{1K2i;}Qs$|^)+`Ef9Bqv;`x0MB7!v^!HAdsTugYQ4KgE9F_@#eFxiM^XbN+*| z%9T&XK69(7>`ln6vXqIjzyW6;13OH!d6(HAEHHlsQ~ZuMEm^XhN<6gWt2)=ZuAlFc zBN%PlhJ3wni}9+j;Nnl;5b*oM(@h1ixbU%Q*u~@i0@&;> z`>#Nmu~WP5;%m)@3cFqU4HuX6OCX=Jiu(ftQ02mOppUVFq2NWhO|Ffj!E1~bZU&2R zhg=IsLN!f(IEU&gW6378?bg5P3CVU}^Pc^Kvh9UL|f Y!aTcg1TL`q+iW*p5Wf3w!}!kl9~5A^$p8QV delta 917 zcmZXTOK1~e6oor^+;%2OA4w*OM$<$EB>}~dK4zNSCf!4uwLmDDNb#C#hB4_p^Lo3;8EW+ekVI ztTYq@zgdH;t$x4%5pDO7f+US(BGnkU0b&6Nhr=If*G1Y)Y9N_Od>&L8fL+bjXf*m; zRaHL4?IbS=ND3R&S%8C(5p1nZRdA-ZAF|@Et4l#naIEf31>I^2^5PDw15iFLX>IK|yk`ovol@I|0M&7I4Yd2N$Gp%-$oI#|8UQxX5l66OL1Y8Ju^dVT9cb?yN7$ zSL4SI^>c!D9B;S}m$_iW_QvxtD!AC#4U>XxO)IG3Y*P|$vTMhHvs)A7J&rhgwGxwq z2QE2#p~N(VeXip$A-L%3skjMuQZR$l?k>2&g$z3NWChRZN90ji{Hh<8cgbRh=MdcD zZVsP%I^njU$J-%)OAh`|8O5_s8cpn*3 z_YQSQ(O?ZR_7@ym_SoroFak-9`kfs7u>{9{x+=%>iEhxDJ-~w^MVYm3dS+0 zg=t0dMVqE&!5D_gWI8RTeMw}q{~_F3j{n6PMhkaoQLIOxTDO=x)>UTEwnqzc!;S5T z*>68#e*W>e=#aB*jui9Bp)*IEW2zO8&N@wg@huw=%kITB@2zEpL2*pj_dTCJ7aY~zZ}rukkN^Mx delta 562 zcmXw$JxC)#6vubs<+)kE6TOT1SUeCL5xho06qHmd$TiyAs0cyOM!QSQmx;NU{58>> z7lYg)f~W0WXJaWMLa?y1J-Av6#d$ksiXXrCc9_}uztq^ts9Vzvt-i*!aji$kggJn( zrc-R?J)fz{ACvi!IXYBU3{#mc4VPG>ebyAB;u{rNlh7Sm+G9=Nha*S3tZ@uBlnAUb zTsK%$VBN&}hu@TEjiTR~q#dPyoNJV0jo=Geb$uYq_|Dx%2DTfkswBG{)(=D$HN7ag z>Pkqyy2@f372`-U)O0NQ&nB9GN*`+3le}%oNiMW52^}}By&{7r+vnTZ(`~D=|6+Sz z`>x!1*?uA!?y#Dod@C=Jg4fO6EB7zS70;=p*~zE>?aavknCePW*4~NxuC!sRgKLC8 z7St0|X?!{)`+*UhNqtXX#%tAcdG=l?-Nbo!Nd*_fv@fpWjG^YssF34W^hZ?m3H;G~-K4(@^>s_@=20;XS7uxy%d=~0rK diff --git a/data/gfx/hud/sb_flag_blue_taken.tga b/data/gfx/hud/sb_flag_blue_taken.tga index 98064785d1634e014b10771c94adbb4d4d823e6d..e6d955fa9aa9957b377fa8ecd34b9c6bac9c8ca3 100755 GIT binary patch delta 662 zcmY+=yGz4h5CHJD+D}bdUwzufwu2x#DY#4U0fG)Lj{X6@5OoloVjo6p#c*bDP!Zpy zt=10WpjccS1;v6Wh?BU8i%2K?cjuK7}!6I>~tlv0>^ zvKSk2UR%}1+u0IVT-%*OsUVp(WCU{NJ!BY$Eosp>${#lc!BuvOTMFEiZ4*bzw}^su zhZ$WI$XIn^H`9m@?5{dj5ogQ%y$XC+B#5y}ohVi5qA?4fz+{6yL4v!gNrpA(7B+~l zLYBBDo)PIO@wGRcP{G5#Rk6 z$VEs?=g2sWHU4%>fGaSI)qQ}#5b_W{0)xmT^alHoDbRzREX@B%8XkikEW&vV&QLRp jab`gddAtjpIi4)n({nwgQ2459?GCNYskI3(6Y~84JCCF~ delta 538 zcmYk%y-NaN9Ki9O%g(%Bt@N}^kCt#KGHPflhoHt#`UhNswi*gr)O<-jwd;pLLxfmT zXIAD=4Mx)97$LPNI7LCx5(G^>&pjP<@O+=oJbNi+~%PujMz_`@Z-k=C5dDb zA0CK=Q8waaEg{V~Sdl0qt*uanq)&;;4rFo=aiEIISy~kB@!XsoW`Bg9N>Ov zGAItaEh$_FE8$jHVvjb467Z#sr>luAx`%veeV~|LW>(u*$9vruv>KH^FEqtE?MN zREow7WdJ7mJ(X2HtI}(dRgRf2D1-1~zEvsr7b!#F8Msqvx0EQu@NT)Gj6iPi?`tt| zTi5C8Av{_aDYGzYTcA9KplzN~hN^9v4U#|2fmxVfLxg#73B&9b;W>B(-V`A$kTCbF O8?$)$$Q*^5VEqM_gqI)y diff --git a/data/gfx/hud/sb_flag_red_carrying.tga b/data/gfx/hud/sb_flag_red_carrying.tga index 5c59d490be0650e07abcec71d4bd363e6ffdbb25..03264c6f9f36265998734d342a53b82d3d53d454 100755 GIT binary patch delta 671 zcmYk)%}WA76aaA7>}9T&Wty251RaAeMu(zPAD6zsOUDS3ZrzHggZ62Ctx*pE7yGs`R+0>hKOgdrHgMg$X zrbHk^%CWa7q)AzfNNbQH9^jLdfFzOOf>nimVg|ph3=%{Y)w&Yw5z{zeyMSGyg0Hqq z*x}68Yp_jB;RsxDCh;B0utlRuEH;#6gU0576ZV2k|7tP%^;osDn!XJajfW7Y`2==5 z@`5)GRd8HR2|mdTVtnnQb61R3oiV{>*QVfy%UrPDWbV+|tcV5qX7j^+ZcU6nx-SJc zTFwM}TaN|rTFo6MJtm($`3B<@`xabn%b9NTW@}C>Va0m{MmCZ-<12}refdr~Q&?y( zi~NrJ|MRQhk6+^jNTb$K;jX|R DOJ=LF delta 593 zcmZ9JIYr`^_SDq{IAl}Qdp{hoC2&yMggk2uucSESSfe^tZ!McNZRH&M4acSw8))gHK^3W9OIM6J zNx>gufp~066GzMn@xiQ0NnEl-$v-SIF<=c5zpY#exAB>7TZ(vL<1ftEE5tARCGoWV zoapN)5~iSH7V>M^-eX(;E789DvrYjIr)=W2RweNoWvXoo9{t zcY6Nj58-HUMJyCW;h}h_6pggB*59BcB+&r?d1Bp=DF;0$!h#$Yh`nbH%a4pJ-0 zpx|#9p%fI!Iz1~-3rb*jKW)fRor{GFcW(&~1zEL(x3X>cpBZ(cCT4JV4+V#9Q zO~5tob~WcTeA}Fd;(D+73Y0j0Fy}Q)SaMM2?y}{ghB50|s4%yRudSz`%CLevTGp|Q zHA3~?OZcZ{Ov7>81WdBtB7V13`8O=!`PRD{n(R|>oi!8??dRYIN5OG`{|*IAI#N*Q z?mb68+~>IJNLwB-R1avvl$6+z*QEr1s)#?Oeo$MBm~P8z?(??e97`xWhcwJN|G8f^ zw~TSuG2T$dMb`k|SOqO|5@y*JDmW1Z=*R&iUZ6P&x=Vbl7 zB_$MmYiWmdW7Tq1ztEI*5(+X_w@&FeWXnKNx~sP9(7Y}UN9-9LzuTvvBm-w0S9Dx; zOu!7gMT~D4hg*yVe4}F?w>igQmfakdofmX$I49vYyIH)^QWA4$X}wQ#wRKk9!IT0LXBd(m@R zVh+D}&gvNR{&gRE*WEk{-zgc$<2m1`{AmmL-j{$SZc#v0JqpVb(`paY7>oE!Jpj)o x{!qJNg;B%J{vE)dnF0yIm(soI-_-GnQ6EEtCwo(UC;F28yGD-m9q-+3_yaxAuaW=& diff --git a/data/gfx/hud/sb_flag_red_shielded.tga b/data/gfx/hud/sb_flag_red_shielded.tga index ea6e797df671d8259d47c92942ebc12edb82411f..551ba613b62d8ff40528f878fcd3b337643828a7 100755 GIT binary patch delta 710 zcma*lOD_Xa6bJB5A7|8*(oz()Z$uDcr4b1WtNI9RgpG*UqNQGKb=rUH9pX)*iASt` z2NoV{ELr#f%$e)9mL@rOe&^gfnYs7ON9ZV|*LV*s#x-YzvccLmBK_X!%y6=41lpBB zEydY752aXBhP5O!$3s0->lDSAK-9WSE6fZkZ7Eu2rg36R(-Kohw|$=$nJK*5&uM|V z3OKGPCOANgG|x=pktPKb2&?DBpJ++oTiw%4ny)0BmF#L!o-%U>!p_{E+>TFYmLfdA zg89;rquud delta 771 zcmXw%Pis>_6vgi(?WB2qrqS1$YW`Gor3ghuyHJ8u6kJL7g<2?RT_~vCs32*YCh1E} z;%(GgZPBEOHHx-^6hZt7LKl7oH+Jd5jh;JW0_S(n+&g)hcP5SWZn_fV->LqGO!lMb zt(dYPL=-_e1f7JgLQ~KPbQp?K3#3Pa08t#}Ce)@Z;UPhBME9Wt6r^>K76ppv3`(8y zvJqcx(mA40v|MV)hLQlghEdv7kX?8tsk-!i0ft9Vnly`H_1NjyOX)5MFzP{hK^Ylc zAM>6|*Nj}Earidz3FTFPTIUmiOuubKv^$|o#*d?sy0#O z_*(Flek|QNj&yD4s@N=l?b_58YwvdFwaIaomA+$bhVSVOZ6eF?(a@S>EP^KDozSXd z^3i7bpr>Y+-Da5xFR2oL4ljb2on`Q+Qvy~mZ$Lv9J3P1grU_Xu|kry>>j zKM@AGuLYiu3V%gEfz7=i!SQ|4343*L%M(A*FLVc5+TI6$8Ccc!0(oM8(;g1DhoeVh zuRAZb9jkZjqsdKqzGoB zHN==c-6`uxn!Y>Dq=HM@QYab5iVtq39YG#MhjH_vSVd~W0M4=-v4T`fnk(C3wUEx2 zZ?ejyo{Ed&YOZ39wUVk+a-6@+`ctZj%95(j66I6z=6#D=tQ}P)dR@>e8q_D^f-Zo2 z-^3=XLe*I%#cCz>T91qM)q28%xT;lO@-MK4YO*4MZ7%ASZBHVO#Dm^#_hJ#1H*eHF zDp6FrXaN)U7f>8RQlPi)RgPdq1-s*sQG>iAUBG2$TGnub2EFx1j1l-YZ~?OsNH+ZA zi0i75wY#&7QTTA*aa$C&8qXOQVc7Frz-Dijr!B#k_lz+PN#8bO0tWnZj462V56bi> zdr%+fXFPz>Ko4UYwgcUahma4n%XA6HU<A delta 666 zcmYMwyGtW+5C`xiCS%-<##1lnbJtGf4#Yw%EW`uxsyhV5!bVF4K?JeR=AlVAFn$pv zB8Wus6~#L}4)GN%6bnVLvl5&90oKOf?6A5pv!9vY?(bFTPIS+I#km<&p|x(f)MKe| zFS4?n?2_TJ1?F6Opq&<2k#uT86i&Y`Yj&@R2at8I%7B5No?S|F(}cI=nC6*5T$ij0 zOEKlm2z?0o4xR3UZ$U_yq@>J1@Rq)F>4V?=aaoOU; 1 && red_icon) // red flag status has not changed during the previous second + drawpic(redflag_pos, red_icon, size, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); + else { // red flag status HAS changed during the previous second + if (redflag == 0 && red_icon_prevstatus) // in this case, the status was lost so we have to use the value in prevstatus to determine which icon to fade out + drawpic_expanding(redflag_pos, red_icon_prevstatus, size, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL, + bound(0, redflag_statuschange_elapsedtime*2, 1)); + else if (red_icon) + drawpic_expanding_two(redflag_pos, red_icon, size, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL, + bound(0, redflag_statuschange_elapsedtime*2, 1)); + } + + if (blueflag_statuschange_elapsedtime > 1 && blue_icon) // blue flag status has not changed during the previous second + drawpic(blueflag_pos, blue_icon, size, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); + else { // blue flag status HAS changed during the previous second + if (blueflag == 0 && blue_icon_prevstatus) // in this case, the status was lost so we have to use the value in prevstatus to determine which icon to fade out + drawpic_expanding(blueflag_pos, blue_icon_prevstatus, size, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL, + bound(0, blueflag_statuschange_elapsedtime*2, 1)); + else if (blue_icon) + drawpic_expanding_two(blueflag_pos, blue_icon, size, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL, + bound(0, blueflag_statuschange_elapsedtime*2, 1)); } } -- 2.39.2