From ee60a09eed277a3505d37d5b20630ed6bf831ca7 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Wed, 6 Mar 2024 20:27:54 -0800 Subject: [PATCH] infodecal: fix client-side ones always rendering. Add some more icons for various NSPointTrigger entities. --- .../textures/editor/env_laser.mat | 8 ++ .../textures/editor/env_laser.tga | Bin 0 -> 1304 bytes .../textures/editor/env_message.mat | 8 ++ .../textures/editor/env_message.tga | Bin 0 -> 7190 bytes .../textures/editor/env_spark.mat | 8 ++ .../textures/editor/env_spark.tga | Bin 0 -> 8315 bytes .../textures/editor/env_sprite.mat | 8 ++ .../textures/editor/env_sprite.tga | Bin 0 -> 7130 bytes .../textures/editor/env_sun.mat | 8 ++ .../textures/editor/env_sun.tga | Bin 0 -> 8555 bytes .../textures/editor/infodecal.mat | 8 ++ .../textures/editor/infodecal.tga | Bin 0 -> 6829 bytes .../textures/editor/monstermaker.mat | 8 ++ .../textures/editor/monstermaker.tga | Bin 0 -> 10942 bytes .../textures/editor/multi_manager.tga | Bin 3142 -> 3812 bytes .../textures/editor/multisource.tga | Bin 3873 -> 4121 bytes .../textures/editor/path_corner.mat | 8 ++ .../textures/editor/path_corner.tga | Bin 0 -> 5703 bytes .../textures/editor/path_track.tga | Bin 364 -> 9312 bytes .../textures/editor/target_cdaudio.mat | 8 ++ .../textures/editor/target_cdaudio.tga | Bin 0 -> 4670 bytes .../textures/editor/trigger_relay.tga | Bin 2631 -> 2761 bytes src/gs-entbase/client/infodecal.qc | 16 ++- src/gs-entbase/server/env_message.qc | 2 + src/gs-entbase/server/info_node_air.qc | 2 + src/gs-entbase/server/info_null.qc | 1 + src/gs-entbase/server/infodecal.qc | 106 +++++++++--------- src/gs-entbase/server/logic_auto.qc | 1 + src/gs-entbase/server/point_camera.qc | 2 + src/gs-entbase/server/point_trigger.qc | 3 + src/gs-entbase/server/prop_door_rotating.qc | 2 + src/gs-entbase/server/random_speaker.qc | 1 + src/gs-entbase/server/random_trigger.qc | 2 + src/gs-entbase/server/target_cdaudio.qc | 2 + src/shared/NSEntity.qc | 2 +- 35 files changed, 155 insertions(+), 59 deletions(-) create mode 100644 platform/base_textures.pk3dir/textures/editor/env_laser.mat create mode 100644 platform/base_textures.pk3dir/textures/editor/env_laser.tga create mode 100644 platform/base_textures.pk3dir/textures/editor/env_message.mat create mode 100644 platform/base_textures.pk3dir/textures/editor/env_message.tga create mode 100644 platform/base_textures.pk3dir/textures/editor/env_spark.mat create mode 100644 platform/base_textures.pk3dir/textures/editor/env_spark.tga create mode 100644 platform/base_textures.pk3dir/textures/editor/env_sprite.mat create mode 100644 platform/base_textures.pk3dir/textures/editor/env_sprite.tga create mode 100644 platform/base_textures.pk3dir/textures/editor/env_sun.mat create mode 100644 platform/base_textures.pk3dir/textures/editor/env_sun.tga create mode 100644 platform/base_textures.pk3dir/textures/editor/infodecal.mat create mode 100644 platform/base_textures.pk3dir/textures/editor/infodecal.tga create mode 100644 platform/base_textures.pk3dir/textures/editor/monstermaker.mat create mode 100644 platform/base_textures.pk3dir/textures/editor/monstermaker.tga create mode 100644 platform/base_textures.pk3dir/textures/editor/path_corner.mat create mode 100644 platform/base_textures.pk3dir/textures/editor/path_corner.tga create mode 100644 platform/base_textures.pk3dir/textures/editor/target_cdaudio.mat create mode 100644 platform/base_textures.pk3dir/textures/editor/target_cdaudio.tga diff --git a/platform/base_textures.pk3dir/textures/editor/env_laser.mat b/platform/base_textures.pk3dir/textures/editor/env_laser.mat new file mode 100644 index 00000000..85ff33ea --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/env_laser.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/env_laser.tga + + { + map $diffuse + alphaFunc GE128 + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/env_laser.tga b/platform/base_textures.pk3dir/textures/editor/env_laser.tga new file mode 100644 index 0000000000000000000000000000000000000000..8c1faad667ad30d54296f8a0c6a6749a85064c5b GIT binary patch literal 1304 zcmZ{kOD_Xa6vsy+h)>}QuwrkaViHE<6$`au!Gc7hL{EKXvQd*=T;r|0zEJLg`{>-3sWzt`_|b<}~zyu+6l_Z&gJ!R#u&0t<>Sibber z#bc-^#S+w`Vj1c|@dWB#@f516cm{Q+cn(!jynwn@yo9<@jG?X-ub^nS1P1sMBGXua z$f7JytRRMgv>jkh$3bnad8yJl<}EfD{PPsIcxl4q8BNBsG$62gD;` zZaE{~nls_rQbyWx&d}vz<-;vOq{%PnhXT@Qn4gb!veFT4X9XhKnc*9iE0+a{w!t%; zkICk&;-du#oJ}|e1xl7DV!+VI84>2L$QoNRkAMo+gBG!S% Yz=daGY%)FNkNcxR_w=AYobK^{0hVR<2mk;8 literal 0 HcmV?d00001 diff --git a/platform/base_textures.pk3dir/textures/editor/env_message.mat b/platform/base_textures.pk3dir/textures/editor/env_message.mat new file mode 100644 index 00000000..7ed2e85c --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/env_message.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/env_message.tga + + { + map $diffuse + alphaFunc GE128 + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/env_message.tga b/platform/base_textures.pk3dir/textures/editor/env_message.tga new file mode 100644 index 0000000000000000000000000000000000000000..d0c64dc363d8ad7cf0b0fb8c65d26d39b755ab0a GIT binary patch literal 7190 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 W@$})NLr)HkjXpH-*iiNG!^z*^l{c3F literal 0 HcmV?d00001 diff --git a/platform/base_textures.pk3dir/textures/editor/env_sun.mat b/platform/base_textures.pk3dir/textures/editor/env_sun.mat new file mode 100644 index 00000000..e0453c13 --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/env_sun.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/env_sun.tga + + { + map $diffuse + alphaFunc GE128 + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/env_sun.tga b/platform/base_textures.pk3dir/textures/editor/env_sun.tga new file mode 100644 index 0000000000000000000000000000000000000000..e5d99ac67b48e3b5841d2787d51d72c11d79c0a4 GIT binary patch literal 8555 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 A7ytkO literal 0 HcmV?d00001 diff --git a/platform/base_textures.pk3dir/textures/editor/infodecal.mat b/platform/base_textures.pk3dir/textures/editor/infodecal.mat new file mode 100644 index 00000000..86013f67 --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/infodecal.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/infodecal.tga + + { + map $diffuse + alphaFunc GE128 + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/infodecal.tga b/platform/base_textures.pk3dir/textures/editor/infodecal.tga new file mode 100644 index 0000000000000000000000000000000000000000..f1c85abcf0f287f609a6316ba9c1c5329c1bd724 GIT binary patch literal 6829 zcmd6sOO6~x5QekcMrv__Ue*O*JxgzlWC?-9OB`X2(Kf^T{kGs3z3>hs7A!5z-bb-i zeE%O=6kpZsYiIDc9qbx?JUA7TJBP{&%|F;o5TzT$fz2 z@M|snK;1333$B4{$8ag%=%(R$nQi^3B|^7c@};D`Zc~>C-#C6GafW^yOL;1w&&M3M z8p+G@?h9_kdNgFK7R9kf1w+r#Ri2HXmU2{Ul*X#ovUEFipD|Lbe?vp610AkkkN6nq zq!dU;X)Xm-M|DRLR9)6;W3|NR64OsXsbcV)%A~;|u-4RNfU_6$na!WBVH3Ab0uE!2j**}&5i>rSYTIwQfr5KnRjjjcz1TFbNqC2BVoF{aD zC^_rK<|vBi7|7M)M3GFp*=69Mv1WH0q}@nGv_fvM8KcSB27TFk4sLRTYpsP@dnzxi z5`kmv;R(47dRwq(N--=of;Qwk|11EMG;E`6r&F0_ooUqSxRt|(o2{}xt5wD;p-lcE zG6x%z=$T-X8x^N&@_3wEqdJWCPsP{4Q8&zbB~6Rv-}HunWE&n&{2N_m`F1z_r}1tYUTtGJI?q@LiPuvFmoG; z%(T#pm~<%a%F`(vVgn_6S1X%9ooHFHksz2%<{caF3s$>~IoFqLL}-jrLa|ec%7i1x za6QL-brZopBF4b@X(9~3BDj8*2&6{UsMdDb`>Dm$%C_*v&hsq2-17E)V7!#2S%&7F z(D=TYV0oTi#K%uthVt>^#mVd`xA7naW&~)d%+K0$e>P4BC>MFw{w=3b-GpP1N$)%i zEx8U>t|ai%G}qIewO(?AWOrSCt!UFpv#_+bW!-^m;JO{nLy^N0MLw7}3{*z75|o2_ z-p&b!A!S7Mp82{V7;ikk0n0-zW?mIAm|yzhd9;Nut_QLbX@Y3OdqSJ7FIQVLi`x{L zpn35lsb)>TPvrfnfCXT)A&CHm@hImg$^zQ3H`Sa9<4&+{2Nx*XJ&!I6lt?LTH1yI7 zdW;j%E|eX>%61eMTuwR~kdvzUS#V2;XAGDxh2ANAH-&cEQ^qa=;|)ak6p|LCEW}I2 zYzGOynFbF_JE&;pko-sZ9JRZXUlFs&6sW2Y31wshCJtOL1jrf5v2^g~nTC-6hsYVp zi-fVO(8frDZg*ET;B%VI@c(-v*=22NkPs@-+nw`)8C;AFh1T2pmQSo2de_%foUX?oT?7#8}fMIc4t zl2y2CHZ8rzsLLqR)#xgw2?`;9bwAgaL%cQTXJuV?WAwljSowQ9CVc6iOLErHH7Is? zJv)%TcrIh&T%_#w8Ujl*w{Cv#M6`WC{v@+zeC51@0oo?{kV$g15DRmn`E zVsXoiv>vo_E;KD>?HkWtC^Lr*w@VGNYH6jZ`<`2J;_YX`SX}j60w=8Blw8qK-nGYR zs*GXH@`l*HC3^UbNZZCtu!&y>R*=8Ud{UWsIybgGK4SE0}WjXH~0z7ir@_^ z?W0MsF@}@}^&^Av>+x=S7sojQm0y$?%}?~EC`{i~EwRWpE*ckfR9qO7ekeq2RccN2 zwoNO8o}QX3D~M(WTZ-Fp^r0qBHo4qtZZ^#HuxT|T+TedouS~j{!?%hublJ4eZS57e zdX`M9JI8j7o%BVWft@a*hGj20ea43A^!m&h|5|6BcUvc#+GBBf+5E>MBQJ}CW}D;o zZi|+^p}KM*Ub$pfw*S$P##v9zD~sTb@>#$>{D1LH_f?2)K

L@M!5NqV1_sCJfbxE5Nmb}0O`7t@hV1UO_Fd1)b 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 PyT;sq`;_nB_BHQ6V~74N literal 0 HcmV?d00001 diff --git a/platform/base_textures.pk3dir/textures/editor/multi_manager.tga b/platform/base_textures.pk3dir/textures/editor/multi_manager.tga index 33c1e6cf8fbf121024ccc286c6af2d5e62563390..f7aa659956fbd1ad1f2d36a3af7795c3bb32bae7 100644 GIT binary patch delta 576 zcmX>m@kDll+D5A@-1R*SQ1HJA#9#vA|F}gOv8!Q(>1qZsz>2^ukT?iHgupDYePDtG zBr(~aOOy}A(#FXO9OAC1LLi+WfMgEX60jJ^CNMyfh1fFrA(t>WSRu%7|G_3RHcej0 zCN71h9qd|!CN{7%)8srBv5C+5EWs{?SpuV5K@5nwP$6XJAu8@mpG_;V9VEj9#Q#AIAVAUu zHk~9fustZIbxu}fH}Yu%nSvq?ax|(4nr&cTF@jV9!T(kW4PM6 S>*3-~lOSs54@{sS=x zpwP`Afku#U6NuF_`5n8J21t;B5yS^EI$#WjE;tLUxOZ|rhZSS@b({M+yVwBJk0!1F diff --git a/platform/base_textures.pk3dir/textures/editor/path_corner.mat b/platform/base_textures.pk3dir/textures/editor/path_corner.mat new file mode 100644 index 00000000..a35b7667 --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/path_corner.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/path_corner.tga + + { + map $diffuse + alphaFunc GE128 + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/path_corner.tga b/platform/base_textures.pk3dir/textures/editor/path_corner.tga new file mode 100644 index 0000000000000000000000000000000000000000..f93e46280f143b27da21e405c897dd8d862b595b GIT binary patch literal 5703 zcmb`L*;W+U5{7pcw%Yv^r>|W$gF=fg7lSf`$e;p(fQ%vq4o{GjtiGn|0s0ZnBb-Nz z^M8?+)LEE*dhv#~LL<90zK3>J&8nJ+g9T>Ell zWJC*#>voJq!dD1Cefl&Ou8x($x0rbR_^~~HqF??^X@s_ZKanXnb097sJ$e+MjQ-_V zBz)DpvP%vr!3fo{NVwIKP7fYDKsdLTPK(E4;bzMk{r&w`>+c^h8bgC^TXmg_7B|_o zx3@O}AXLX9VZXxt`}eB~YlHTf3#Xub8zfMWMJ-)}UA+xL_wL=xPP~v<5ad^!3ZfV~ zG_RT=rSluTEA{ATwPrKPlnEF4-4`&d5k%O`H}WM~*3_mN_a)3^$M;|i!;!D z>@1v}>!&Y$#!obVbadqMdwY9aJ+sGMZnOB}MVOzT53@RbYHBKo0)j$1C`A31Bd(-^ z;pa;BS)UZ`>+Q4NzFsNa=Un3Ij+W|9N!^(lsXI3p78Vx5%a8U(eLt z+6p^6JK_EAdsp}H@Gu-pm6MYbsaBVY=i$?*PvNtE=jZ3%KRrG5`Qzi`aCmqS_V@N( zT@1i|y4?@BGXUn?44A_K7|Q^-v6b1pF)%P-f8q<7+M}hFr%-#QqV`gx_IiifyYH)N zXBMuzs$af*317c{4WB=M_Wr5h02b6fh}6F1Hg~y=E4d&m&&_ryIqp`@l)QnJv2Nqx z!-tV8N4A}mlGD?rl8Y~MSI%u)QF41H#7dTK++9g*UMPue_Y?vis@x`XWm$5etCH7R za^U-TmHVc^mJamBSBS# zd$yy5Eg?Iq4Du!EuNdQd`Q*uyEM=vd4!1Q%VG$%pe$Bq>Ykj~m!mS~CnjO+?_SFna ze7eRoi;?x=JB2VKzBvD~fxB__3cqDn$gd$;j%NS=dKKp@U}jJMo>P6ot0(HBkx_o5 zmeNRQp?4{mov9R*CD~}gOAh6w43Bc6MtY`76oFf+NVl4Tz(;_y6uiUbl+a8puiuQ? zGp1PavFa_n{8ZkvhT_N)`IMWc+$&L@Hzh@DC{-R!zCaM7%~@5$j)p9f|s_lzpwCoMeeS+nuG{i-N!|m74{gysDh2aU11pTU%eZ zRBUH85rL1${*j>IZ`wCybxRa1+CJVz=U8sML&`71oVd?YbRG-TVj2_8TB_7(HCl{RF{t7BDxORgg{8``R#SpCw(bx_UDh*|B2%N4?HJoh zA=9#sJ8BstRg1fGqNAu^D%2%X_x48t)QPn!WtDW+0K5b|JJFNAVo+WBoK z0wXGmn#u+L9;)w#?X*PGR5MztO3Heaa!tv|N7@Sfyq3SL3b4*4T9koEleu8AJz6* z*?XhB*=v+pR3YSNaurk#IYY!yENlvMLW-~*ga$)FLGTPr0&Bnr#66+SMTtj@LTF)V zJS20cGj~)xjy~hK1hz&Vi=pGYckc}L*x1;xH*en9t5>fKHbeJcTK87~P?Bx~pyX2k zK-wT9!1RzgGz}NSu?~RP(g6_XL2FPJ0KhrW3hqu=5bp#qQJRIFqF!OcJRXl%FyFOY&fWwW05^OSQ~*#3Sprac002x+ zmjIBgJp^(Or~sgx76VYae|G@zi~;~W0IF(xz~+_!*l2q|ka^wLy2Pgzc=;Z3c0|3B7K-rK)=OK`%CwQO|0^$I8x&)va0xK(} z2T;S${ffs!3;_REPy!HzKu&@bdem|S31X3g1c_Bhs~|z@5lD@Kf?C1Tq)4wwz-J1fAqgHN#aA=F0c&|m z_#!$!e7g{4#24pZHn?En1v3e)Y>}QAKYUO8kM~5!AAe%#&+784iPtkLGm9_ouT9R( IPy7}B4=crZ_5c6? literal 0 HcmV?d00001 diff --git a/platform/base_textures.pk3dir/textures/editor/path_track.tga b/platform/base_textures.pk3dir/textures/editor/path_track.tga index 666d51d498d67a3e6d4d3d5424aacdb83620584d..b5be7823b914d83dd4be285b3ed53ceedc0e4460 100644 GIT binary patch literal 9312 zcmeHN_j40h5MCWg%;e%pg9HKrxe+(vNJcizrr44#Te7U;0tP|~xJqv6)j~Lq4TMtgB@rc zXj>hbbEng(996awuXgdgUA&UXlxm-93=gOuJ4oy?hdK zg6XAhNEfVj9*5PAV@x}aGQD`1=>?HaNC&=7!84(=QRfCz&pIybfkHjkcr~j@-|4S# zIJL%4(y1?*PKvBDowy1~GId|UXjg)3==c{*$3BOAhNtu?(-AzW!yhwseuS*~0P;Q( z;ytEA?=rP7;VCXMITx5-k2AH!Ab6?=XP6w*Os$hlEti>^-(hNco2l_Frq?dwslS21 zoyU_sho^j&srC$>IwJAByC^Q_CR6V<++go@jC-zgQnV}5r%|tfhMdlVY!r}>VC>Fd z6o_ApR)3a?w z&=I-60~F5oOw)I*FY^Rv5cwQ|ts;E^dNM z;$}kDgxDF#ip1?XXHir~ZsEqgH+dWN-DK+f29jwLN|7OqX8}K@A`7gUXbRFi+Jq!( zO)g7IMo{HwHiB;CsO0A%;FSDyAwQjFoJI0eFg8l`fbjsLC;3^2=t+KJA{Lu(-FJX$ zlh>$!6JUT*A#M>^(=-<~waCnvof9dm#ZQA#6PT$-{FIE1 z-}V)3@^Aktp$h%|{p|CJ_@MjPhjZz3cVziMMXS6+n^1?rfdNhq4i2(y00-l)N{pE= z-b``8AK+vl5MW!t?`MOP*iuEuOcx83U@*vu;o)K4790+;DAME3u^?M{o4hlHI1~zT zI2_`T2=q`mtXhLqRkTtLg`%iWhB?`UIR%G?I4QSg8-nI?xfHpvmlzWdc5zXhB~4F* zC3SUmA(86qm7^8f+9wWH#DR%NSS-n6Nft{ozmKr`Zeb4=OR`v!#gZOZmINL$Jw44* zLP*Tc&ax)j3|^HTxiW_)T&1*4o(+JwY_j;c5{t!Hi_OK8qYgX-xiC_aXdcH ziTU|?*5WwKp~oN;6>Ln-(jbBHc$^m&7C5oAw8WZd(qk|tt-OuN*(Tt{=i|I6&X$*# zSzBCOWVyw>v+_13XF{>$KIHO*_|Zhm+*yvEmbX#P3Rsi2zOliVFJI!x$tg}uO-->j zIXS6%T&`@jse(;;7F8wb;RoXs>KOnj6JjR1^cmHsidGiWvg%Q$nwz<5W7VUKU;Y-; zGU}yPJqkZdt$NhsTaQvTm9eogPL7X{vu$i_JkMuJjOE#aDhZ8@jBs*vbd+tP8Dyx$ zSpMRwO_YQpkqAel5spNoN{>V`t-)L>TIC&*@RC(2^%QQL8GU)VG?&1r`G<>t!&n_zz~GadB$HDS>7H8W*QFoDygT lpmA|(!zqDg02&v+HlX5=pitK^&tOk~Kivp7Paju31^@s(Mm_)l diff --git a/platform/base_textures.pk3dir/textures/editor/target_cdaudio.mat b/platform/base_textures.pk3dir/textures/editor/target_cdaudio.mat new file mode 100644 index 00000000..adf31307 --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/target_cdaudio.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/target_cdaudio.tga + + { + map $diffuse + alphaFunc GE128 + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/target_cdaudio.tga b/platform/base_textures.pk3dir/textures/editor/target_cdaudio.tga new file mode 100644 index 0000000000000000000000000000000000000000..62b72f3720150699d0e65c9b7062cab25f449c78 GIT binary patch literal 4670 zcmcIoTW?fV6rM|Ip72!a}883rf? z3e*yykdR0#WoRkAcNlt|7TQh+kb*O_T;I3PKKslt7%;e#nVva&pS8aAt?OwhR2{Nw zRcKY{?d9$G`Ql&S;jumXkwdup7GJgck=>$;SHI!jH~8YuT5MD<^_`Z#Z=I3+&9jp4 zK8t%&xc<8ouC)nI@a(U6YFF{2uVjW#%Kf2J^4CC%JcgKF71I+C)1_kmY?DIgIgzX9 zqz1An?iWaEz*mia%*N}JV@;C2b6oBvn{iMUA%5_bJnC?)F;Pea^mKxaA{{?L zd|k1QHwW*=Wn|`v+?hNk6XV97ySJNVe)I$}gRVy&UAcfgzAn(E_LS&4=;s*m%^U_qUORZz>opwmbd)VLFuWbiE< z9ZI)KV)2mlEX43rhG*h(d&-bHt&Rh!b82X2?_a62p>9q@*hwlSJl_3Cfiqc+wKA0Rw^&k2F^aM!-0N&uU0}&QxEu;a+(?tj=Np!37e&po;6>4c!4^S2`Oyll)nMck7P$7k>x}*pim4qJ z3Qd=4Psy+netoe~ZqCPy&sUOeH5+szuI3QKYBrXQt6&-;uAHY!&8A}TZp^NOl&Z%) zqvX0gYBuCP-sb!`#Deo1ierUX3eP*ixLG63alTUlKW!6zS~}p>raL zMK}iP7%_yvtL3=&gq1vyTMQL82l(*F=8Eid-5{Cs-Fn z5SubrO`ATGJ$t^D+SNU*;2zD&0xBT50Um@ZmR2GxoOgA-V&le7rJ-S$T)cQm8XIHf5HVvTr#(;Q zwTbeM3VO;*L}Tg%5Gk5KVYDG@>x4z)>hQAd+rK7?*48$eo}Q7;&MqQy0p&x7dRt8p z)bJjHy3n>{iYWI>q6jI)rjF#s@{6dgWnNRS@xXZ&GL|cWZvXxR($R5E=H@aoKffr$ z!$~4!((#yY4ge_EkQ9YK5$Et{{>pR!A@*6ILa*UCiY-P1+t~0lE0Aq$wgO=^(1mB1 zqtsmmh_P5)5{Yg?%w+CMHv3T0=~*82=`;DohsY6S5U?@*E0t|R5spV%_kd<0s4ufNybIIdFbv7Fb zVQ>M=CRlBSE3_||J1pzeT!kUb4lSJV0z(+;8)8i&K!ltCqI#eKSf{m=KDSGVG!Kw! z945FQ$piNjWfZ0ER$#;-zG^$X`E7T=42jUccI`UZy7dd$yLX?ow_lbTAd6yW$Br6l zYHF78@hNHW@jAZTRlw6g?KVswbAaJ=WK*u=wnr;kME^aV0nE#0Kx&d7lPvu)9OIb*@~F!8ZbOn!-wDrKD1*dU~%5^ z#>|%m387{j5rAY%V6p24b<7`CNMqJ@6>uGL05V>J%UlsD0i2Mh`2YX_ literal 0 HcmV?d00001 diff --git a/platform/base_textures.pk3dir/textures/editor/trigger_relay.tga b/platform/base_textures.pk3dir/textures/editor/trigger_relay.tga index 6b89255f6affa3a964e1e2bf1af0a224727ed972..93bf61870cb3057742f7d833ad96608a440b5bc0 100644 GIT binary patch delta 415 zcmZWl%MHRX6l1jMr{YPe9Q*nCrS0T3 zecsFcrTA7n1DNha0Pq9}fk&k-q7w;lK0M0VMw6rnNhP|%C)N4GVnqR;OppzZVgMDO zt85h;Y_+XL8pybE8g8igKY|pdR$~fJIh2|bc48zKn#`u>4Inl3IA^ckzlcjlerj^ KH(RhzWCj4U#3V)l diff --git a/src/gs-entbase/client/infodecal.qc b/src/gs-entbase/client/infodecal.qc index b08947e1..15823ebf 100644 --- a/src/gs-entbase/client/infodecal.qc +++ b/src/gs-entbase/client/infodecal.qc @@ -22,12 +22,21 @@ public: virtual void SpawnKey(string, string); virtual float predraw(void); virtual bool CanSpawn(bool); + virtual void Respawn(void); private: decal m_decChild; string m_strTexture; }; +void +infodecal::infodecal(void) +{ + drawmask = MASK_ENGINE; + m_decChild = __NULL__; + m_strTexture = __NULL__; +} + float infodecal::predraw(void) { @@ -36,6 +45,7 @@ infodecal::predraw(void) m_decChild.Place(origin, m_strTexture); Destroy(); } + return (PREDRAW_NEXT); } @@ -62,12 +72,10 @@ infodecal::SpawnKey(string strField, string strKey) } void -infodecal::infodecal(void) +infodecal::Respawn(void) { + /* if it has a targetname, it can't be made client-side only */ if (targetname) { Destroy(); - return; } - - drawmask = MASK_ENGINE; } diff --git a/src/gs-entbase/server/env_message.qc b/src/gs-entbase/server/env_message.qc index 988e319c..9c58487a 100644 --- a/src/gs-entbase/server/env_message.qc +++ b/src/gs-entbase/server/env_message.qc @@ -115,6 +115,8 @@ env_message::SpawnKey(string strKey, string strValue) void env_message::Respawn(void) { + InitPointTrigger(); + Trigger = Play; } diff --git a/src/gs-entbase/server/info_node_air.qc b/src/gs-entbase/server/info_node_air.qc index 56d6f638..26c10ba0 100644 --- a/src/gs-entbase/server/info_node_air.qc +++ b/src/gs-entbase/server/info_node_air.qc @@ -43,6 +43,8 @@ info_node_air::info_node_air(void) void info_node_air::Respawn(void) { + InitPointTrigger(); + SetSize([0,0,0], [0,0,0]); SetSolid(SOLID_NOT); SetMovetype(MOVETYPE_NONE); diff --git a/src/gs-entbase/server/info_null.qc b/src/gs-entbase/server/info_null.qc index f7b7c34b..92ff1c16 100644 --- a/src/gs-entbase/server/info_null.qc +++ b/src/gs-entbase/server/info_null.qc @@ -71,6 +71,7 @@ info_null::WarnDeveloper(void) void info_null::Respawn(void) { + InitPointTrigger(); ScheduleThink(WarnDeveloper, 0.0f); } #endif diff --git a/src/gs-entbase/server/infodecal.qc b/src/gs-entbase/server/infodecal.qc index f952730b..e5fb14df 100644 --- a/src/gs-entbase/server/infodecal.qc +++ b/src/gs-entbase/server/infodecal.qc @@ -42,11 +42,11 @@ infodecal:NSPointTrigger public: void infodecal(void); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Respawn(void); virtual void Save(float); virtual void Restore(string,string); - virtual void SpawnKey(string,string); - virtual void Respawn(void); - virtual void Spawned(void); virtual void Trigger(entity, triggermode_t); private: @@ -61,6 +61,55 @@ infodecal::infodecal(void) m_strTexture = __NULL__; } +void +infodecal::SpawnKey(string strKey, string strValue) +{ + switch (strKey) { + case "material": + m_strTexture = strValue; + break; + case "texture": + m_strTexture = strtolower(strValue); + break; + default: + super::SpawnKey(strKey, strValue); + } +} + +void +infodecal::Spawned(void) +{ + float bsp_version = serverkeyfloat("*bspversion"); + + super::Spawned(); + + switch (bsp_version) { + case BSPVER_HL: + case BSPVER_RBSP: + case BSPVER_Q3: + case BSPVER_RTCW: + break; + default: + Destroy(); + return; + } +} + +void +infodecal::Respawn(void) +{ + InitPointTrigger(); + + if (HasTargetname() == false) { + /* we'll let the client-side handle this infodecal */ + Destroy(); + } else { + /* this will be invisible by default. needs to be triggered. */ + Trigger(this, TRIG_OFF); + m_decChild = __NULL__; + } +} + void infodecal::Save(float handle) { @@ -84,57 +133,6 @@ infodecal::Restore(string strKey, string strValue) } } -void -infodecal::SpawnKey(string strKey, string strValue) -{ - switch (strKey) { - case "material": - m_strTexture = strValue; - break; - case "texture": - m_strTexture = strtolower(strValue); - break; - default: - super::SpawnKey(strKey, strValue); - } -} - -void -infodecal::Spawned(void) -{ - float bsp_version = serverkeyfloat("*bspversion"); - - switch (bsp_version) { - case BSPVER_HL: - case BSPVER_RBSP: - case BSPVER_Q3: - case BSPVER_RTCW: - break; - default: - Destroy(); - return; - } -} - -void -infodecal::Respawn(void) -{ - InitPointTrigger(); - - /* this will be invisible by default */ - if (!targetname) { -#if 0 - /* spawn automatically, remove self */ - Trigger(this, TRIG_ON); -#else - Destroy(); -#endif - } else { - Trigger(this, TRIG_OFF); - m_decChild = __NULL__; - } -} - void infodecal::Trigger(entity act, triggermode_t state) { diff --git a/src/gs-entbase/server/logic_auto.qc b/src/gs-entbase/server/logic_auto.qc index 07d1db42..642d1ec3 100644 --- a/src/gs-entbase/server/logic_auto.qc +++ b/src/gs-entbase/server/logic_auto.qc @@ -198,6 +198,7 @@ logic_auto::Spawned(void) void logic_auto::Respawn(void) { + InitPointTrigger(); ScheduleThink(Processing, 0.2f); } diff --git a/src/gs-entbase/server/point_camera.qc b/src/gs-entbase/server/point_camera.qc index 8f3efb70..3dc324ea 100644 --- a/src/gs-entbase/server/point_camera.qc +++ b/src/gs-entbase/server/point_camera.qc @@ -142,6 +142,8 @@ point_camera::SpawnKey(string strKey, string strValue) void point_camera::Respawn(void) { + InitPointTrigger(); + SetModelindex(0); SetSolid(SOLID_NOT); SetSize([-16,-16,-16], [16,16,16]); diff --git a/src/gs-entbase/server/point_trigger.qc b/src/gs-entbase/server/point_trigger.qc index 1964e389..950de135 100644 --- a/src/gs-entbase/server/point_trigger.qc +++ b/src/gs-entbase/server/point_trigger.qc @@ -177,6 +177,9 @@ void point_trigger::Respawn(void) { vector vecMins, vecMaxs; + + InitPointTrigger(); + SetMovetype(MOVETYPE_NONE); SetSolid(SOLID_TRIGGER); SetOrigin(GetSpawnOrigin()); diff --git a/src/gs-entbase/server/prop_door_rotating.qc b/src/gs-entbase/server/prop_door_rotating.qc index b7145569..1d23ea8a 100644 --- a/src/gs-entbase/server/prop_door_rotating.qc +++ b/src/gs-entbase/server/prop_door_rotating.qc @@ -103,6 +103,8 @@ prop_door_rotating::SpawnKey(string strKey, string strValue) void prop_door_rotating::Respawn(void) { + InitPointTrigger(); + SetModel(GetSpawnModel()); SetSolid(SOLID_BSP); SetMovetype(MOVETYPE_PUSH); diff --git a/src/gs-entbase/server/random_speaker.qc b/src/gs-entbase/server/random_speaker.qc index 97cbbf3c..f9f956b9 100644 --- a/src/gs-entbase/server/random_speaker.qc +++ b/src/gs-entbase/server/random_speaker.qc @@ -126,6 +126,7 @@ random_speaker::SpawnKey(string strKey, string strValue) void random_speaker::Respawn(void) { + InitPointTrigger(); Disable(); } diff --git a/src/gs-entbase/server/random_trigger.qc b/src/gs-entbase/server/random_trigger.qc index 1e7a576e..40482533 100644 --- a/src/gs-entbase/server/random_trigger.qc +++ b/src/gs-entbase/server/random_trigger.qc @@ -114,6 +114,8 @@ random_trigger::SpawnKey(string strKey, string strValue) void random_trigger::Respawn(void) { + InitPointTrigger(); + if (m_iStartState == 1) Trigger(this, TRIG_ON); } diff --git a/src/gs-entbase/server/target_cdaudio.qc b/src/gs-entbase/server/target_cdaudio.qc index 38cc97bd..eaaa3a2f 100644 --- a/src/gs-entbase/server/target_cdaudio.qc +++ b/src/gs-entbase/server/target_cdaudio.qc @@ -96,6 +96,8 @@ target_cdaudio::SpawnKey(string strKey, string strValue) void target_cdaudio::Respawn(void) { + InitPointTrigger(); + geomtype = GEOMTYPE_SPHERE; mins = [-m_flRadius, -m_flRadius, -m_flRadius]; maxs = [m_flRadius, m_flRadius, m_flRadius]; diff --git a/src/shared/NSEntity.qc b/src/shared/NSEntity.qc index b85c2325..ed2e4f10 100644 --- a/src/shared/NSEntity.qc +++ b/src/shared/NSEntity.qc @@ -564,7 +564,7 @@ void NSEntity::SetNextThink( float fl ) { if ( flTime >= 0 ) nextthink = flTime; else - EntError( "%s sets bogus nextthink value %f\n", classname, flTime ); + EntError( "%s sets bogus nextthink value %f", classname, flTime ); } void NSEntity::ScheduleThink( void ( void ) func, float fl ) {