X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=3b2837fa09e329a22436ea038c849c8458264637;hb=d5f400a06400d5322330cfdbb97a661707b3d150;hp=82c9723f90c6459565bd7d0b2b80ed0eb14660b1;hpb=6190deb68aa1c9e92ede62ea05c2a755bf5516de;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_entity.c b/world_entity.c
index 82c9723..3b2837f 100644
--- a/world_entity.c
+++ b/world_entity.c
@@ -11,18 +11,18 @@
 #include "ent_challenge.h"
 #include "ent_skateshop.h"
 
-VG_STATIC void world_entity_focus( u32 entity_id ){
+static void world_entity_focus( u32 entity_id ){
    localplayer.immobile = 1;
    menu.disable_open = 1;
 
    v3_zero( localplayer.rb.v );
    v3_zero( localplayer.rb.w );
-   localplayer._walk.move_speed = 0.0f;
+   player_walk.move_speed = 0.0f;
    world_static.focused_entity = entity_id;
    skaterift.activity = k_skaterift_ent_focus;
 }
 
-VG_STATIC void world_entity_unfocus(void){
+static void world_entity_unfocus(void){
    localplayer.immobile = 0;
    skaterift.activity = k_skaterift_default;
    menu.disable_open = 0;
@@ -30,7 +30,7 @@ VG_STATIC void world_entity_unfocus(void){
 }
 
 /* logic preupdate */
-VG_STATIC void world_entity_focus_preupdate(void){
+static void world_entity_focus_preupdate(void){
    f32 rate = vg_minf( 1.0f, vg.time_frame_delta * 2.0f );
    int active = 0;
    if( skaterift.activity == k_skaterift_ent_focus )
@@ -39,27 +39,22 @@ VG_STATIC void world_entity_focus_preupdate(void){
    vg_slewf( &world_static.focus_strength, active, 
              vg.time_frame_delta * (1.0f/0.5f) );
 
-   if( !active ) return;
-
    u32 type = mdl_entity_id_type( world_static.focused_entity ),
        index = mdl_entity_id_id( world_static.focused_entity );
    world_instance *world = world_current_instance();
 
    if( type == k_ent_skateshop ){
       ent_skateshop *skateshop = mdl_arritm( &world->ent_skateshop, index );
-      ent_skateshop_preupdate( skateshop );
+      ent_skateshop_preupdate( skateshop, active );
    }
    else if( type == k_ent_challenge ){
       ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index );
-      ent_challenge_preupdate( challenge );
-   }
-   else {
-      vg_fatal_error( "Programming error\n" );
+      ent_challenge_preupdate( challenge, active );
    }
 }
 
 /* additional renderings like text etc.. */
-VG_STATIC void world_entity_focus_render(void){
+static void world_entity_focus_render(void){
    if( skaterift.activity != k_skaterift_ent_focus )
       return;
 
@@ -79,7 +74,7 @@ VG_STATIC void world_entity_focus_render(void){
    }
 }
 
-VG_STATIC void world_gen_entities_init( world_instance *world ){
+static void world_gen_entities_init( world_instance *world ){
    /* lights */
    for( u32 j=0; j<mdl_arrcount(&world->ent_light); j ++ ){
       ent_light *light = mdl_arritm( &world->ent_light, j );
@@ -192,7 +187,7 @@ VG_STATIC void world_gen_entities_init( world_instance *world ){
                                  indexed_count, 2 );
 }
 
-VG_STATIC
+static
 ent_spawn *world_find_closest_spawn( world_instance *world, v3f position )
 {
    ent_spawn *rp = NULL, *r;
@@ -221,7 +216,7 @@ ent_spawn *world_find_closest_spawn( world_instance *world, v3f position )
    return rp;
 }
 
-VG_STATIC
+static
 ent_spawn *world_find_spawn_by_name( world_instance *world, const char *name )
 {
    ent_spawn *rp = NULL, *r;
@@ -239,7 +234,7 @@ ent_spawn *world_find_spawn_by_name( world_instance *world, const char *name )
    return rp;
 }
 
-VG_STATIC void ent_volume_call( world_instance *world, ent_call *call )
+static void ent_volume_call( world_instance *world, ent_call *call )
 {
    u32 index = mdl_entity_id_id( call->id );
    ent_volume *volume = mdl_arritm( &world->ent_volume, index );
@@ -266,7 +261,7 @@ VG_STATIC void ent_volume_call( world_instance *world, ent_call *call )
    }
 }
 
-VG_STATIC void ent_audio_call( world_instance *world, ent_call *call ){
+static void ent_audio_call( world_instance *world, ent_call *call ){
    if( world->status == k_world_status_unloading ){
       vg_warn( "cannot modify audio while unloading world\n" );
       return;
@@ -359,7 +354,7 @@ VG_STATIC void ent_audio_call( world_instance *world, ent_call *call ){
 }
 
 
-VG_STATIC void ent_ccmd_call( world_instance *world, ent_call *call ){
+static void ent_ccmd_call( world_instance *world, ent_call *call ){
    if( call->function == k_ent_function_trigger ){
       u32 index = mdl_entity_id_id( call->id );
       ent_ccmd *ccmd = mdl_arritm( &world->ent_ccmd, index );
@@ -372,7 +367,7 @@ VG_STATIC void ent_ccmd_call( world_instance *world, ent_call *call ){
  * ----------------------------------------------------------------------------
  */
 
-VG_STATIC void 
+static void 
 entity_bh_expand_bound( void *user, boxf bound, u32 item_index ){
    world_instance *world = user;
 
@@ -425,7 +420,7 @@ entity_bh_expand_bound( void *user, boxf bound, u32 item_index ){
    }
 }
 
-VG_STATIC float entity_bh_centroid( void *user, u32 item_index, int axis ){
+static float entity_bh_centroid( void *user, u32 item_index, int axis ){
    world_instance *world = user;
 
    u32 id    = world->entity_list[ item_index ],
@@ -454,7 +449,7 @@ VG_STATIC float entity_bh_centroid( void *user, u32 item_index, int axis ){
    }
 }
 
-VG_STATIC void entity_bh_swap( void *user, u32 ia, u32 ib ){
+static void entity_bh_swap( void *user, u32 ia, u32 ib ){
    world_instance *world = user;
 
    u32 a = world->entity_list[ ia ],
@@ -464,7 +459,7 @@ VG_STATIC void entity_bh_swap( void *user, u32 ia, u32 ib ){
    world->entity_list[ ib ] = a;
 }
 
-VG_STATIC void entity_bh_debug( void *user, u32 item_index ){
+static void entity_bh_debug( void *user, u32 item_index ){
    world_instance *world = user;
 
    u32 id    = world->entity_list[ item_index ],
@@ -512,7 +507,7 @@ VG_STATIC void entity_bh_debug( void *user, u32 item_index ){
    }
 }
 
-VG_STATIC void entity_bh_closest( void *user, u32 item_index, v3f point,
+static void entity_bh_closest( void *user, u32 item_index, v3f point,
                                   v3f closest ){
    world_instance *world = user;
 
@@ -541,7 +536,7 @@ VG_STATIC void entity_bh_closest( void *user, u32 item_index, v3f point,
    }
 }
 
-VG_STATIC void world_entity_start( world_instance *world, vg_msg *sav ){
+static void world_entity_start( world_instance *world, vg_msg *sav ){
    vg_info( "Start instance %p\n", world );
 
    world->probabilities[ k_probability_curve_constant ] = 1.0f;
@@ -573,7 +568,7 @@ VG_STATIC void world_entity_start( world_instance *world, vg_msg *sav ){
    }
 }
 
-VG_STATIC void world_entity_serialize( world_instance *world, vg_msg *sav ){
+static void world_entity_serialize( world_instance *world, vg_msg *sav ){
    for( u32 i=0; i<mdl_arrcount(&world->ent_challenge); i++ ){
       ent_challenge *challenge = mdl_arritm(&world->ent_challenge,i);