X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_challenge.c;h=02fac7deaad77e1b9d27fa1a5bb3c9505b3c771a;hb=d680579754c876a74bf77ac74a224900ce0b3ff9;hp=bed85870c08d2ce0b1fa0f581bdfc85b8f6ebc36;hpb=99376ce8eaf30125fb08dd5dc8b534800580fe47;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/ent_challenge.c b/ent_challenge.c
index bed8587..02fac7d 100644
--- a/ent_challenge.c
+++ b/ent_challenge.c
@@ -4,8 +4,9 @@
 #include "entity.h"
 #include "input.h"
 #include "gui.h"
+#include "audio.h"
 
-VG_STATIC void ent_challenge_call( world_instance *world, ent_call *call ){
+static void ent_challenge_call( world_instance *world, ent_call *call ){
    u32 index = mdl_entity_id_id( call->id );
    ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index );
 
@@ -34,9 +35,37 @@ VG_STATIC void ent_challenge_call( world_instance *world, ent_call *call ){
    }
 }
 
-VG_STATIC void ent_challenge_preupdate( ent_challenge *challenge ){
+static void ent_challenge_preupdate( ent_challenge *challenge, int active ){
    world_instance *world = world_current_instance();
 
+   /* maximum distance from active challenge */
+   if( !active ){
+      f32 min_dist2 = 999999.9f;
+
+      if( mdl_entity_id_type( challenge->first ) == k_ent_objective ){
+         u32 next = challenge->first;
+         while( mdl_entity_id_type(next) == k_ent_objective ){
+            u32 index = mdl_entity_id_id( next );
+            ent_objective *objective = mdl_arritm(&world->ent_objective,index);
+            next = objective->id_next;
+
+            f32 d2 = v3_dist2( localplayer.rb.co, objective->transform.co );
+            if( d2 < min_dist2 ) 
+               min_dist2 = d2;
+         }
+      }
+
+      f32 max_dist = 100.0f;
+      if( min_dist2 > max_dist*max_dist ){
+         world_static.challenge_target = NULL;
+         world_static.challenge_timer = 0.0f;
+         world_static.focused_entity = 0;
+         audio_oneshot_3d( &audio_challenge[6], localplayer.rb.co,
+                           30.0f, 1.0f );
+      }
+      return;
+   }
+
    if( mdl_entity_id_type( challenge->camera ) == k_ent_camera ){
       u32 index = mdl_entity_id_id( challenge->camera );
       ent_camera *cam = mdl_arritm( &world->ent_camera, index );
@@ -77,6 +106,7 @@ VG_STATIC void ent_challenge_preupdate( ent_challenge *challenge ){
             next = objective->id_next;
             v3_fill( objective->transform.s, 1.0f );
          }
+         audio_oneshot( &audio_challenge[5], 1.0f, 0.0f );
          return;
       }
    }
@@ -84,11 +114,12 @@ VG_STATIC void ent_challenge_preupdate( ent_challenge *challenge ){
    if( button_down( k_srbind_mback ) ){
       world_static.challenge_target = NULL;
       world_entity_unfocus();
+      audio_oneshot( &audio_challenge[4], 1.0f, 0.0f );
       return;
    }
 }
 
-VG_STATIC void ent_challenge_render( ent_challenge *challenge ){
+static void ent_challenge_render( ent_challenge *challenge ){
    
 }