X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_challenge.c;h=72149b1a4d4dd72327c01b71ad6207cb8a8b2fbe;hb=74b2136d5b41b18e2eec698f1fd11b503aa1100a;hp=e6c543b2163a37f673b4f1e67fd7c53cc283a303;hpb=bd3a7e904be0fc97e70761cc957a28609d366586;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/ent_challenge.c b/ent_challenge.c
index e6c543b..72149b1 100644
--- a/ent_challenge.c
+++ b/ent_challenge.c
@@ -6,7 +6,7 @@
 #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 );
 
@@ -27,6 +27,13 @@ VG_STATIC void ent_challenge_call( world_instance *world, ent_call *call ){
           (world_static.challenge_target == NULL) ){
          world_static.challenge_target = NULL;
          world_entity_focus( call->id );
+
+         gui_helper_clear();
+         vg_str text;
+         if( gui_new_helper( input_button_list[k_srbind_maccept], &text ))
+            vg_strcat( &text, "start" );
+         if( gui_new_helper( input_button_list[k_srbind_mback], &text ))
+            vg_strcat( &text, "exit" );
       }
    }
    else {
@@ -35,7 +42,7 @@ VG_STATIC void ent_challenge_call( world_instance *world, ent_call *call ){
    }
 }
 
-VG_STATIC void ent_challenge_preupdate( ent_challenge *challenge, int active ){
+static void ent_challenge_preupdate( ent_challenge *challenge, int active ){
    world_instance *world = world_current_instance();
 
    /* maximum distance from active challenge */
@@ -60,35 +67,15 @@ VG_STATIC void ent_challenge_preupdate( ent_challenge *challenge, int active ){
          world_static.challenge_target = NULL;
          world_static.challenge_timer = 0.0f;
          world_static.focused_entity = 0;
+         audio_lock();
          audio_oneshot_3d( &audio_challenge[6], localplayer.rb.co,
                            30.0f, 1.0f );
+         audio_unlock();
       }
       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 );
-
-      /* TODO COMPRESSION */
-      v3f dir = {0.0f,-1.0f,0.0f};
-      mdl_transform_vector( &cam->transform, dir, dir );
-      m3x3_mulv( localplayer.invbasis, dir, dir );
-      player_vector_angles( world_static.focus_cam.angles, dir, 1.0f, 0.0f );
-      v3_copy( cam->transform.co, world_static.focus_cam.pos );
-      world_static.focus_cam.fov = cam->fov;
-   }
-   else {
-      /* TODO COMPRESSION */
-      v3_copy( localplayer.cam.pos, world_static.focus_cam.pos );
-      v3_copy( localplayer.cam.angles, world_static.focus_cam.angles );
-      world_static.focus_cam.fov = localplayer.cam.fov;
-      world_static.focus_cam.nearz = localplayer.cam.nearz;
-      world_static.focus_cam.farz = localplayer.cam.farz;
-   }
-
-   gui_helper_action( button_display_string( k_srbind_maccept ), "start" );
-   gui_helper_action( button_display_string( k_srbind_mback ), "exit" );
+   world_entity_focus_camera( world, challenge->camera );
 
    if( mdl_entity_id_type( challenge->first ) == k_ent_objective ){
       if( button_down( k_srbind_maccept ) ){
@@ -97,6 +84,7 @@ VG_STATIC void ent_challenge_preupdate( ent_challenge *challenge, int active ){
                                                      index );
          world_static.challenge_timer = 0.0f;
          world_entity_unfocus();
+         gui_helper_clear();
 
          u32 next = challenge->first;
          while( mdl_entity_id_type(next) == k_ent_objective ){
@@ -106,7 +94,9 @@ VG_STATIC void ent_challenge_preupdate( ent_challenge *challenge, int active ){
             next = objective->id_next;
             v3_fill( objective->transform.s, 1.0f );
          }
+         audio_lock();
          audio_oneshot( &audio_challenge[5], 1.0f, 0.0f );
+         audio_unlock();
          return;
       }
    }
@@ -114,12 +104,15 @@ VG_STATIC void ent_challenge_preupdate( ent_challenge *challenge, int active ){
    if( button_down( k_srbind_mback ) ){
       world_static.challenge_target = NULL;
       world_entity_unfocus();
+      gui_helper_clear();
+      audio_lock();
       audio_oneshot( &audio_challenge[4], 1.0f, 0.0f );
+      audio_unlock();
       return;
    }
 }
 
-VG_STATIC void ent_challenge_render( ent_challenge *challenge ){
+static void ent_challenge_render( ent_challenge *challenge ){
    
 }