X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_challenge.c;h=10196bf635fce0ed5297ae84ef513391412ef900;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=e6c543b2163a37f673b4f1e67fd7c53cc283a303;hpb=bd3a7e904be0fc97e70761cc957a28609d366586;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/ent_challenge.c b/ent_challenge.c
index e6c543b..10196bf 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 );
 
@@ -35,7 +35,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 */
@@ -66,26 +66,7 @@ VG_STATIC void ent_challenge_preupdate( ent_challenge *challenge, int active ){
       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;
-   }
+   world_entity_focus_camera( world, challenge->camera );
 
    gui_helper_action( button_display_string( k_srbind_maccept ), "start" );
    gui_helper_action( button_display_string( k_srbind_mback ), "exit" );
@@ -119,7 +100,7 @@ VG_STATIC void ent_challenge_preupdate( ent_challenge *challenge, int active ){
    }
 }
 
-VG_STATIC void ent_challenge_render( ent_challenge *challenge ){
+static void ent_challenge_render( ent_challenge *challenge ){
    
 }