From 0205109fd1609f8b59720bc704c969c046205682 Mon Sep 17 00:00:00 2001
From: hgn <hgodden00@gmail.com>
Date: Tue, 8 Aug 2023 20:55:26 +0100
Subject: [PATCH] this makes more sense

---
 ent_challenge.c            |  10 ++++++++++
 maps_src/mp_spawn/main.mdl | Bin 13228824 -> 13228832 bytes
 shaders/scene_font.h       |  20 +++++++++-----------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ent_challenge.c b/ent_challenge.c
index b01e490..6f031ba 100644
--- a/ent_challenge.c
+++ b/ent_challenge.c
@@ -92,9 +92,19 @@ VG_STATIC void ent_challenge_call( world_instance *world, ent_call *call ){
    }
    else if( call->function == 2 ){
       challenge->flags &= ~k_ent_challenge_hidden;
+
+      if( mdl_entity_id_type( challenge->id_next ) == k_ent_challenge ){
+         call->id = challenge->id_next;
+         entity_call( world, call );
+      }
    }
    else if( call->function == 3 ){
       challenge->flags |=  k_ent_challenge_hidden;
+
+      if( mdl_entity_id_type( challenge->id_next ) == k_ent_challenge ){
+         call->id = challenge->id_next;
+         entity_call( world, call );
+      }
    }
    else {
       vg_print_backtrace();
diff --git a/maps_src/mp_spawn/main.mdl b/maps_src/mp_spawn/main.mdl
index 6acac827112e9de92f7721115b0cab679138c8e1..70e0724743bee5018dfcde1474c9a44b09a0380c 100644
GIT binary patch
delta 1217
zcmajbX;6((9LMqJd2Tle(W27RwPh<wiL#fnWC__z)OEYL$))9r2q|Taax7UQYh}HO
zvX*2WjbW}k;{|Vw_r?n|dSS-*W*P7NXFli5Ip_C3XXaEk);L$gS}x1}qC)nO--tR{
z9hdq_k~ESeO@wisB_%ggZ!zYY)@QNyZI>i1bMWsogWhb+(X*hwiyyM86xxKJ;-@RO
zNs=?0PH<deFqqREAxG7U1V!aBv!ZIP@5qQU#YdNA|COFf!qH*L(Wj?p7&<!&MJpYt
z;$!F7p{Tml_mWhv(@3G5o72{&<Qa1;ol%Bz5vEb)=!SSrc(d=9kl41jpGsq1Z`>05
z?Q=nN2fTwmL<wuYD%vfHTCL<EDGm9pE$*)I%@J)$-HT#M3Pg-8NtQ*GEmBs5-4+?B
zk-Yv~&j)yPevo6s@llTYJBzPzo;sKRC3?91n-E{K14OjlOV)_`WVP62-(|APP@sVm
zv~WfjxS%Us(GA_v18(SvUT}v8JmH1j@P-e3(FcA|;SU}9q96KW00tregD@CFFciZO
zh#(9{Fh(E*BN2))j6yg@V+<k?iLn@m@tA;#n1soQLNulz2C<lmX_$@~h{H_G!febz
zJmz8^<|6?Mun>!|7)!7e%aDj9EJrd{U?ozJ3O!cAfHWA9j@2+B18b0pwJ>8H)*}nq
z$U!bF*nm82#3tlpGq#`rTd@t>QHUKVLNRut1f|%8-PnV@*oXZn!vP#bIVx}n0*7$~
zM{x|5IF1uIiBqV;X`Ded&f*--;{q<?5^7M3I$XvTT*Wn9#|>CfkDF+~E!;*Uns5hq
gaS!+L01wfO7Cb^L9-|FU@D$JR950$o_Lo-ePZpIJg8%>k

delta 1254
zcmX}mc~neM9KiAW-ZT>}v`k9l*+O;_WhraOu58JYF-^uYnr23_Qz%Q6Yv1?mBD-WK
z{Fmk&$2rdNr+@v&AI|Ze@p8}k+~0k_<=%JpL5=AsYO55*BCC~HWvINWScWxz6v7~c
zNP~T~H_x-u>a}|ug)Y9geiFh+?5o#oR;S%<<%6|E{!uLIk0u$f#%sTtgfNi|g8vem
z&6)3S@~;S)rCNB*salM2%|ZmrN;Ot<`2KZg(BYr(x~&BT%WZ*)68Vye9QiG<|5hzp
z&KDu>Xa+Hmx-)-OUa{Tn4YaaV$Rq>z*G)4dH`K+wdK4LwT%YnfH>`AQqDOxHoU5pE
zNOP(ZB%RHv?M=emGA9)M94w-QL2fHb&`kal^&mYO^k@up{LGAw4%ahb|2xb~YVvz?
ztC-e$E<}%^{wSH!jQUGadL>ei5iK3zZS_o>K!$%Y#sp63zF6tVHkY}4<u0EB6$S*s
z2or+Q3at@>P=p~IZO|4Gh(r{kVMYwvAr^6Hk9b(n0UA1@6FQ>{x*`GH&>cOHh@R+$
z-spqA=!gCofPqNDAS7cjh9Cv07>Z#SjuA*hI!0m?Mq>=dVjMCs9uqJTnV5vhn1ZR8
zhUu7rnaDymW??qwU@qn%2lJ7O1z3nhSd2U@ffY+(Lq6;%z%n?n94oLAtKh_H6vBlf
zxZ!~pYfy}}D8V|c#|CV~CTzwQY{fQ|q72)y13OWU3hcse?7?1CVjuRS3e`9OiGw(V
z!#IMYIELdmfs;6e(>Q~(IEVANfQz_<%c#K>T*Wn9#|_-XE!;*e?%*!!a1ZzK01xp9
ikMRUgQIBV6z;nF7OT5Bsyun+%!+SJ7booBi8vg=Ki4%hW

diff --git a/shaders/scene_font.h b/shaders/scene_font.h
index 747175a..8a2555d 100644
--- a/shaders/scene_font.h
+++ b/shaders/scene_font.h
@@ -65,7 +65,7 @@ static struct vg_shader _shader_scene_font = {
 .orig_file = "shaders/scene_font.fs",
 .static_src = 
 "uniform sampler2D uTexGarbage; // unused\n"
-"uniform sampler2D uTexMain;\n"
+"uniform sampler2D uTexMain;    // unused\n"
 "uniform vec3 uCamera;\n"
 "uniform float uTime;\n"
 "uniform float uOpacity;\n"
@@ -431,15 +431,14 @@ static struct vg_shader _shader_scene_font = {
 "#line     10        0 \n"
 "\n"
 "vec3 pal( float t ){\n"
-"   vec3 a = vec3(0.3,0.3,0.3);\n"
-"   vec3 b = vec3(1.00,1.0,1.0);\n"
+"   vec3 a = vec3(0.30,0.3,0.3);\n"
+"   vec3 b = vec3(0.8);\n"
 "   vec3 c = vec3(0.28,0.3,0.4);\n"
 "   vec3 d = vec3(0.00,0.1,0.1);\n"
 "   return a + b*cos( 6.28318*(c*t+d) );\n"
 "}\n"
 "\n"
-"void main()\n"
-"{\n"
+"void main(){\n"
 "   compute_motion_vectors();\n"
 "\n"
 "   vec3 vfrag = vec3(0.5,0.5,0.5);\n"
@@ -457,12 +456,11 @@ static struct vg_shader _shader_scene_font = {
 "   vec4 v1 = step( vec4(0.5), fract(vec4(a) + spread1) );\n"
 "\n"
 "   float d = ( v0.x+v0.y+v0.z+v0.w +\n"
-"               v1.x+v1.y+v1.z+v1.w ) * 0.0625;\n"
+"               v1.x+v1.y+v1.z+v1.w ) * 0.125f;\n"
 "   \n"
 "   float dither = fract(dot(vec2(171.0,231.0),gl_FragCoord.xy)/71.0);\n"
-"   const float STEPS = 8.;\n"
-"   float x = d*0.8+length(p)*0.2;\n"
-"   x = (floor(x * STEPS) + step(dither, fract(x * STEPS))) / STEPS;\n"
+"   float x = d*0.8+length(p)*0.3;\n"
+"   x = (floor(x*8.0) + step(dither, fract(x * 8.0))) / 8.0;\n"
 "\n"
 "   if( x + (uOpacity*2.0-1.0) < 0.5 ) \n"
 "      discard;\n"
@@ -473,8 +471,8 @@ static struct vg_shader _shader_scene_font = {
 "      vfrag = vec3(0.5);\n"
 "   }\n"
 "\n"
-"   vec3 litfrag = scene_compute_lighting( vfrag, qnorm, aWorldCo );\n"
-"   oColour = vec4( litfrag, 1.0 );\n"
+"   vfrag = scene_compute_lighting( vfrag, qnorm, aWorldCo );\n"
+"   oColour = vec4( vfrag, 1.0 );\n"
 "}\n"
 ""},
 };
-- 
2.25.1