From a28a9ea0007c44b1f2754c6ea0fc463a0442f803 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Tue, 8 Jun 2010 16:20:17 +0300 Subject: [PATCH 1/1] notify messages MOSTLY work... some breakage here and there, please test :/ --- gfx/hud/wickedhud/notify_pushoffedge.tga | Bin 0 -> 63254 bytes gfx/hud/wickedhud/notify_selfkill.tga | Bin 0 -> 19795 bytes qcsrc/client/hud.qc | 45 ++++++++++++++++++----- qcsrc/server/g_damage.qc | 12 ++---- 4 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 gfx/hud/wickedhud/notify_pushoffedge.tga create mode 100644 gfx/hud/wickedhud/notify_selfkill.tga diff --git a/gfx/hud/wickedhud/notify_pushoffedge.tga b/gfx/hud/wickedhud/notify_pushoffedge.tga new file mode 100644 index 0000000000000000000000000000000000000000..13311aeb947844a645fb0705ec805e9ced289785 GIT binary patch literal 63254 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 CAiypF literal 0 HcmV?d00001 diff --git a/gfx/hud/wickedhud/notify_selfkill.tga b/gfx/hud/wickedhud/notify_selfkill.tga new file mode 100644 index 0000000000000000000000000000000000000000..6d714f91288090536623e8a62a042cdb8bdb8198 GIT binary patch literal 19795 zcmd6vdAwHR`u}_OZZ{XH$We-3LRt`&IzN}#r9)y?oz1FA0e_-udNCB>dl z)zgc?WoDemYgO*4%d!b{gu~!)Xbt;-$E>92C$E_0kF{7xb@1?RP!BB5eN`dzwrAF1 z%_sC zAxV-+@L}clT`c=RSLg^$VRxuD)>2eR_iU>Dz~=CZaj+1!Kn@bf!e&?i@4z5Xy-u(< zL_F;<&`R8;G8#7?7QbNhc(@U_J%eO&dp^4R& z!#Z}%qOe!X%gal*Zr$2v^XARRvA!S2>Vx5%8Dp8QS>|5Q4OH}fSO!}mG4R5jWYeZi zxd{^{l)wM}`@drBzu12b91G3BhPR|l^yu$)HrQabOZ)?-fSM))Scxz$sIV1-mu%a% zZNj>B>xTaF%P&_@;fb8n4nhf*nU@OXs)hV#Mr+7lv0>}s(xE5}LjFnk9gMHE^~+p)9^Iag5Vq@_!jKDuJXihf9Z zD*IY-w$?_$FYYX{QFbK!9VWnP3NlcWLHwjOSFKu=KKbO6>9}#@vg_BcU&6kz@K@*x zEx@L$w!_#GHkGyo=A8BGufLAsvUwC*b`LxAZI;bu%aHMB{ytf@Y}w!%z z?Fu}nq4q3gwOq|_1iEt`41v$VE)hnvp0b{nmX(#IwW%XT?R3tZIpG8`lCZswlRg65 z+EO}!(OWy5_;%+?&0g&=vmXsM{euraSW5(Gx?vYZs}K89oK0=xv<}rL6%`emIb#t$ z=wlok$@Z-ry9f>iD^qtPMYoEcv`#P2sGNz)L%UJZeiYmRPDQi6Ebn697?{Cv6F_+c z)^55xfByXRhaY}O$B!SMzWw&w;jv51813a|NLj6`BU4DGfm6iz+-S3bcch%(5ntbaRUuO!oF-RGr^8#YPcJ${uD4}>YVkM-rqV|TW9n0vRCazRqWTB<}OwY1dOt!)q+&>T^m zjqo)Lhd;on;7!Fw)2otQ#j(XS{2UlT2|rSl(VrV&nN=*)o|aaDq|`d%L!7}SQY$cS|qT4Et8%my+E#>04yGP$o6k;3b?O3=4 zE`YP(B% zu3$QB1d*tA2w9C?MPL^_9BzcdplOpawXG?8ta1|@wxnjvz{JU0wrrUKKax0>VO}8` z6f+`{WjWZw>tO{b>|}Tq9tLYurmoN)8bdt@s|F};9kvwLK45gWfG%(m+z!uyoy}-p z4Vxe`dRF6eP5FuNq~#6C&1kunyZKVG*SB-$&i!EK%$Z|Xu3Y&t``^KdFSvXTEP+*^ z(Mv(YC&1&N(HDa1o(ZRc{ktRV2|E;yk>dsI(jUXZ)9-;d;Tuew1@l=qbf>ZYG5iZN zpJ5E}5ckN(X#SVc_!G>Z!?6_*9&&yT)Y+v$uocvKIn0DfU_B#Y5L^w`e+cXiDr(CY zgBj6$&>D_`zHke8?F7(1L)W@(Q|q2#>PUJ0gChj*tmZLbCzOGrW-FI&Z-EV< z70a<`9@fp^KKuzm@fJeg?M(aM@??u!iO*lw74Jig+IUz zFbrOUY48)64V1MIuL#*Is+= zT;lhn88c=aM_N9LbB^Vj?r=Vs4*I}F&>Kt*D&jf%a|9d?9bjLm57i(O!+^-fjoDQ1 zs!$sg*`(}4T5YHc4uKl5Z+EEYam?KdQ`)jTiDUg>F#GLRN~OSyVGSr{3|4ZMnuUTG zM)z7+1k>RocoSZQH{fGXe8u_=wyJ)G(QOIJYH3F6dho1ov11~Pg{RoIJKq7g z&Lst$LIj`i{rBG=iL8h4JZHCV1+BpzqkQ(^Q{ZGU(3JCFD4g4p^%l?s)TKJ)2jVf{ z9KdF#)H_KAV=^Ap{9;=`xr?D1M|=Wn42Qs(?7J3*z!;bS1t~)Sw#y+hprvJPR|QaH z&#+4`gXNX$?lX68gF+WC2QD`lEQh&!uO}rW5K|` z4hF+ZVBGuwI&M6fw{$q4IjgW1qn0v@FNhEmNXee;F_w%YqtQ50!uc>2-h{`%7`g&} z4`+cfe+(SPdPmUJ{Xn@C@nG_q16r>aHf;7@exg==EHw2h*5|<#cmwPwR^A^j21`E! zxnFg z2zK1(;eGfPmO{9tsL4QnV#JfM)HhpoGZ@CRU=pazFt`aW0e$KY$HQ@;k_TYzUSKO| zifU_C=3b4ou1rj@uW-|oY!Y3uS@(vvU_e|CLt!j@4vSzN#E39&Z&+^M*x6W{Ok?fs z!$D(hgcCpm+e2$;4h=EXguK0{tktTR3mL%S%#fXpv<-~JL*Puf4juvx{1j%x&!B42 zJMxp17L@GHPZmry8^MV2{IB6%cphwmE1?H;h8EBmYJ)0f?$(+r`|i7MX0glJSUczK!ymKk4!rd?v zp%ORNI-IVzF86|i;9xis+QEU)2y|CvbU9zVR}=&=$_|CI!A2Ybva4)lrjGAh71|94-&P$ z>Z+?cjTkZF$jOr@cV*mvEWUetYymcdog%t--2c9@Gwj2z45(mro@{C{rfslh&6>81 z274jjeH8HqN>AbVbodHvwb$SYxRYZ_Yaky2R@VbG?{O%IW{c}eOuJ8zBLKU3u&$;YYM%6WmHbTCA zDW)TG_U2*tL5lmF;(q3s-D3;5To0PI2)^T(j*W%~;XZfy@%YFKw_>19dY=47J zJB+Bie#}hr{c;cPN5cqp$b{5gsS8;3^=h#99@&_;qthE;$1eR3|GV$tr zn!#zj7J=Qr375B{sG|wYQ|HZ_cNq`bkD%t4sOfZKZV)HM9n+}gulQAa10dslA<2~2g9*&8uSDMtWvDcV336UQiEeKuy>knm`-SO<)K)%bj!5Evdp*at}Y-yH5q{ z>tQ~4eLv_3wRUK;2b*f6u{P!5U^Dh0gnBW3aQ9=6J+@)w$dQ}gdh4w+`fQeT;A>ke z^!;K&$i=%?HpA8k3L8k-H1cQo7RJLU&_WG42Q;P`)Q4J70%nTLAj7>;kt0}kHH)8IV^-lj_wut{DUIC-Kf)+5dYeIUd^;1J zub`B6{tgVZ?r=IPoWq3Y<EhLYr(SIVwr z#T#HDXzNQb5H5q0p$+Tx_FMASrU?@!B!#!+PdxENNcF}WZ^S!Xs~x}v5u#SQ9%jSaFa!*yQ=tPi0i~)2 zMGqN74P67p^N8}a1VisII2sHlORx_bNEgG6@Boa4N!YLel*YW1f8wpfm?GsCmeTO) z^5x4@0>K29vOfVw0ru7rVCi8=e5w=iREJ%*ol^=eIjN@FWJH|wCG6YJ-Lo#SIz4cWo`#QYH_#EX)pY<~dv!i8`M=(w&GjnH8;x@8xf zuFbkJaUj^Gj|JnQ;IOf99i@+g>EP?SN+(_8DKFtgOrn!I`|PvN#>W^>KmD}(Dv0jq zDZxhA;be?2!z6Y)OS&hR*)D-$FcsE8PH!Xdt;>8{4r{@|`Y4WF21=s~x?;;_p4L%= z-Aqvk{6dSiVxN8WI5-8)rL@~eK9`9^Hl{Td8ZK^qxGN;12Qa19ht<7E51BS)G0vO^Ru(4dV3oU>WOM!RoRu*=H{B zbB9GZHi@DirK-L-*beh{VR^cOpZ%ch^ z`Vr4W{c1s9!7gWL~ev3(*;ps@dN>^XP< zZiD{NuX1S``wLtEM?h1k5o4Gc)}(+I?QV0GL3TSl4r5_F#eV>A!jo_)ObjQPsS^gESrn*0KW-l;x zo&n|pl_FtLLaz>VtwPM#&?2Zod<2e+l;}J&+mnH z)m+2L?Y+T#p#Q{%Z3&j;l_B4bCiIkIuo@H9L7*w8`?z$zC#zT|Fvx6!qWB`qb8Ra{DqPod{0JcFS=KBo^-4yGO57X;db9L|>Ck7gTQrdI9Rzd8s zilk5Zr{HKyFV$4t^suL@mCC5L)gJ(bj*@rKv%JbHbp1HE6g2)pcnqG0*I^<|1xIo- z;d}TJ-iI-89~dbogY9Z`<-brGz*?rJF1zAx(0wMQ-B%RTPVu>rhYLP=*p{si zMwv3WZPVm^vF!`K7xHf?r_?d=0OG z)}IfmR~Pb;uPa4&^HUs7Ez-M~xQmD#8eFsZnEoN*Y&29ba ztFI~;SQc9Ea(Pzfv3-h z-(V}nmNVa!<8GU~;DQU14jnqA&6_t*nUs&A29q`vOYZJSoBRxRaiK$^*9(vp&r^q_+dN(T-c znEv$BPx1I?q#`Qzao{x8hrl$jJrym>m{wtPZQ8U+ ztkjn*X3ZSk8xRU%;kK=QeL-i-PDK1w76>3s_8`+U6j(!QQ>yq3?3ul8R!kop=8&pOob-9 z3*aS+cgW#KcaEoWjMmB+09Wj}=bn{S>E#he9Fa0a_VFlWj5mDcT>mq?4OhT{P(7+z zrB`*>G*uXd84nBpyft@1U+fi*;QMtPV%bVd-3h}c*tEJW)?o^a9a?DPeG%30C(o53@ z4H`txj7}2On;@KYhzCWAh>TqbC&e(7J^;P7j=nnyN#oxuV#%H$(aO&LB7c=x)gx;-7{Tnn8WrK)&T8o|R18 zeIph7aH;&ZUg~Hd|7k-FOi3BPrA+cC!-fq@Zo28FXOo*xc_As5Trbc#g{tKqH1Yl+4!az`+H}IN;g>F_DU^IC!0YZDtZ=X!}d9*Xdumt z`>d7P^M?-~o{-JcPe1)MwR*1DwR#Qq{`5Lr1D(L?OV(R`yuL5^Y&$y`I2H!7J_Xi- z9^`$F>X9`|{>}{;Fd*sDrAvDF;fJTJM=zr*9&WE?)@8B4u8AQFmX-0e` zNtl_U)TAZrnIE+3?;uZCPl z)JP9I?6CBO7hXusJNI)*G_GbCfU96SjD)^$5Y!A4;-dizR*71$9~=c&fL3e$V%QA1 z=u!S8)lEXY+)VoQ>le2I?>~I9kv{UsBk|8i9^kC)F=@^@dr)t<3&wz^uY|3jOK}_jub!Px%hh>3kluCIT`6D2#CUQ4{r69Y4jmdMab-+= zCxcxx_>CB&Z6nNvXW<-Z3{_*49N#CYkHOjqxlog|4Jdo(-jsHu0~Sd*;aM@0`7yZ&=87Zn7K$X3vFqi zI}EOc(O{li4TeJ$Y>$gOu(sMj9x>+QD9g~ye=g;H-7%X>xBZtqTDm=b>z`Lvg#G5( zyeAPZ#&)3!8}U838d^cMusfdTYOtx(wV@4M1~!LJK)*uhJBXEh(N+=y=hJ$aQ_XC^ z_Y0}_;bV_IHkNL?Khl|3Wj(hn*4&p^X}G+Lwf4H1@F<)LhGlUK5W-rWDu&;|>F^NP zC??*#3iq;>57B(NWRFOg&Pwx-JyVy31RAzkoH{9{&5;ji_iCNvpSZh3X$GU`{Q~3Q zQfLMxVPSkjpoO~T4eVg(4<^LL5bryap{&L1f9S)2B9_`2b*Ob>kF+A^4`bZx&M>#o ztj4~c{|&6i_RGXQI?OO~Eu=B1;}G}?)HDl z-$P(Wh4IGU3iaFN{?HdjgMNEy@*F?Wn+t{gMim=DKl9VU1>cOhIq(1+0d*no+b&fp zu_^0nco$Yf6c$x!45cR#7V9(rYejQ8PjxzhN#lR1s6B_She@yjLd1Wv5>08f-u}Fc z@9@WP(c5icP}{y8p?ZYNF23lZs@?z}z;6&$MAs`66t{hbJ@Jr3RdJ_?VO87)9gv#R z>~|h5rI56kHA^yyZ-#8NccDc4+cdZpT0p+9MF@F{t=SSThqpnA^DieXC8@40_9i|$ zPx(eJUWxH|8P;fl$uh0uSc&=8lu4BI<(FShc@|EYL`i*z%qSylN4}#Q-3CvnLd$M_<&{^mEnBvXhd*vOF*W1ezg@d_>6kHN;`R{6 z*RlO)&z_z3>C-2zRjXE#mEbpuC}0-mzoHl;L;8bKX$SbrLLwpSlu;#^0u>9mBeM+52vCRO}HhV+ZXz}?0cCl+H=40^= zlWMRtIwVV5%SKkcL2x|m2}NOAJP~-h1vP^1a1Zr-0?SzU1`_GQYs2BZCRNzVe>f64 z#nD2wp1%R+QN~-Kt6gC)D2~U%s5b7s?5Yk;pc|*&4mO~1W|z?VNVCIOsjS|$Qiy+_ z;XzZVE&er(qJS$|9ttLb;&p~{Jbdk3p9*w=KXdvBn8^B1;9b~U5o6b62y4-niPxHb zbj|91f!UyY1K|wT4Zzxvi3jjy)*GAbQr+F)08Tv#Zeaa6_zV`pTF}*s5c6Kv^1gb# z9$Kwtsp@k00mgx*Lpom(jwHLxaU?k|t7cdj% z!&1=8RiMyoG;6JC$Sse|gXu51UIoQHswSI7V56vp zV+4(`agK*mpeI~tMSt+ji@}0>x#vQ!_qf$`gCn6m><^8>GW9uAX7oiWS2hdMXDzo% z8=(p82VQyrXmK-ezrABGD{N$PZ3y~eNgCijn=?~kC6S0@vvRkG<4t-^OQ>btg{w*i zuu+uZM~d9aBo-23TP60pdA~pD|HF@$`q%TkUMKZF?flcuKCAtOC!f~iqz+a751;&q A&j0`b literal 0 HcmV?d00001 diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 8d65a834f..6f4aadffd 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -2131,23 +2131,39 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) print("^1",s1, "^1 drew first blood", "\n"); else if (type == DEATH_TELEFRAG) print ("^1",s1, "^1 was telefragged by ", s2, "\n"); - else if (type == DEATH_DROWN) + else if (type == DEATH_DROWN) { + HUD_KillNotify_Push(s2, s1, DEATH_FALL); print ("^1",s1, "^1 was drowned by ", s2, "\n"); - else if (type == DEATH_SLIME) + } + else if (type == DEATH_SLIME) { + HUD_KillNotify_Push(s2, s1, DEATH_FALL); print ("^1",s1, "^1 was slimed by ", s2, "\n"); - else if (type == DEATH_LAVA) + } + else if (type == DEATH_LAVA) { + HUD_KillNotify_Push(s2, s1, DEATH_FALL); print ("^1",s1, "^1 was cooked by ", s2, "\n"); - else if (type == DEATH_FALL) + } + else if (type == DEATH_FALL) { + HUD_KillNotify_Push(s2, s1, DEATH_FALL); print ("^1",s1, "^1 was grounded by ", s2, "\n"); - else if (type == DEATH_SHOOTING_STAR) + } + else if (type == DEATH_SHOOTING_STAR) { + HUD_KillNotify_Push(s2, s1, DEATH_FALL); print ("^1",s1, "^1 was shot into space by ", s2, "\n"); - else if (type == DEATH_SWAMP) + } + else if (type == DEATH_SWAMP) { + HUD_KillNotify_Push(s2, s1, DEATH_FALL); print ("^1",s1, "^1 was conserved by ", s2, "\n"); - // TODO - /*else if (type == DEATH_HURTTRIGGER && inflictor.msg2 != "") + } + else if (type == DEATH_HURTTRIGGER && s3 != "") { - print("^1", s1, "^1 ", s2, "^1", s3, "\n"); - }*/ + HUD_KillNotify_Push(s2, s1, DEATH_FALL); + // p ?!?! :o + //if(p < 0) + print("^1", s1, "^1 ", s3, " ", s2, "\n"); + //else + // bprint("^1", s1, "^1 ", substring(s3, 0, p), s2, "^1", substring(s3, p+1, strlen(s3) - (p+1)), "\n"); + } else if(type == DEATH_SBCRUSH) print ("^1",s1, "^1 was crushed by ^1", s2, "\n"); else if(type == DEATH_SBMINIGUN) @@ -2224,6 +2240,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) print (s1,"^7 unleashes ^1ARMAGEDDON!\n"); } } else if(msg == MSG_KILL_ACTION) { // wtf is this? isnt it basically the same as MSG_SUICIDE? + HUD_KillNotify_Push(s1, "", DEATH_KILL); if (type == DEATH_DROWN) { if(cvar("cl_gentle")) print ("^1",s1, "^1 was in the water for too long\n"); @@ -2273,6 +2290,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) print ("^1",s1, "^1 died\n"); } } else if(msg == MSG_KILL_ACTION_SPREE) { + HUD_KillNotify_Push(s1, "", DEATH_KILL); if(cvar("cl_gentle")) print ("^1",s1,"^1 needs a restart after a ",s2," scoring spree\n"); else @@ -2366,6 +2384,13 @@ void HUD_Notify (void) drawpic_skin(pos + eX * 0.5 * mySize_x - eX * (mySize_y/entries) + eY * i * (mySize_y/entries), strcat("weapon", self.netname), '2 1 0' * (mySize_y/entries), '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); } else if(killnotify_deathtype[i] == DEATH_KILL) + { + drawpic_skin(pos + eX * 0.5 * mySize_x - eX * (mySize_y/entries) + eY * i * (mySize_y/entries), "notify_selfkill", '2 1 0' * (mySize_y/entries), '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + } + else if(killnotify_deathtype[i] == DEATH_FALL) + { + drawpic_skin(pos + eX * 0.5 * mySize_x - eX * (mySize_y/entries) + eY * i * (mySize_y/entries), "notify_pushoffedge", '2 1 0' * (mySize_y/entries), '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + } } /* This will come later. string s; diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 55def58fc..538383b4f 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -483,14 +483,6 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) bprint ("^1",s, "^1 was shot into space by ", a, "\n"); else if (deathtype == DEATH_SWAMP) bprint ("^1",s, "^1 was conserved by ", a, "\n"); - else if (deathtype == DEATH_HURTTRIGGER && inflictor.message2 != "") - { - p = strstrofs(inflictor.message2, "#", 0); - if(p < 0) - bprint("^1", s, "^1 ", inflictor.message2, " ", a, "\n"); - else - bprint("^1", s, "^1 ", substring(inflictor.message2, 0, p), a, "^1", substring(inflictor.message2, p+1, strlen(inflictor.message2) - (p+1)), "\n"); - } else if(deathtype == DEATH_SBCRUSH) bprint ("^1",s, "^1 was crushed by ^1", a, "\n"); else if(deathtype == DEATH_SBMINIGUN) @@ -526,6 +518,10 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) if (deathtype == DEATH_CUSTOM) msg = strcat(deathmessage, " by ^1", msg); + else if (deathtype == DEATH_HURTTRIGGER && inflictor.message2 != "") + { + msg = strstrofs(inflictor.message2, "#", 0); + } Send_KillNotification(s, a, msg, deathtype, MSG_KILL); //} -- 2.39.2