X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_objective.c;h=ce5ad0f2168c9067d504a0ca8cc17d4f05b0c8c8;hb=refs%2Fheads%2Frigidbody;hp=d516e2756895d0c045d92c5b1730d28c72516f25;hpb=8c6ba83d5eaab5922468e981c4e8b799d8f77e2f;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/ent_objective.c b/ent_objective.c
index d516e27..ce5ad0f 100644
--- a/ent_objective.c
+++ b/ent_objective.c
@@ -7,7 +7,7 @@
 #include "audio.h"
 #include "steam.h"
 
-VG_STATIC void ent_objective_pass( world_instance *world, 
+static void ent_objective_pass( world_instance *world, 
                                    ent_objective *objective ){
    if( objective->id_next ){
       world_static.challenge_timer += objective->filter;
@@ -21,13 +21,17 @@ VG_STATIC void ent_objective_pass( world_instance *world,
          ent_objective_pass( world, next );
       else{
          vg_info( "pass challenge point\n" );
+         audio_lock();
          audio_oneshot_3d( &audio_challenge[0], localplayer.rb.co,
                            30.0f, 1.0f );
+         audio_unlock();
       }
    }
    else {
       vg_success( "challenge win\n" );
+      audio_lock();
       audio_oneshot( &audio_challenge[2], 1.0f, 0.0f );
+      audio_unlock();
       world_static.challenge_target = NULL;
       world_static.challenge_timer = 0.0f;
       world_static.focused_entity = 0;
@@ -40,29 +44,13 @@ VG_STATIC void ent_objective_pass( world_instance *world,
          entity_call( world, &call );
       }
 
-      u32 world_completed = 1;
-      for( u32 i=0; i<mdl_arrcount(&world->ent_challenge); i++ ){
-         ent_challenge *challenge = mdl_arritm( &world->ent_challenge, i );
-         if( !challenge->status ){
-            world_completed = 0;
-            break;
-         }
-      }
-
-      if( world_completed ){
-         const char *understate = "Understate DIY park";
-         if( mdl_pstreq( &world->meta, world->info.pstr_name, 
-                         understate, vg_strdjb2( understate ))){
-            steam_set_achievement( "CITY_COMPLETE" );
-            steam_store_achievements();
-         }
-      }
+      ent_region_re_eval( world );
    }
 }
 
-VG_STATIC int ent_objective_check_filter( ent_objective *objective ){
+static int ent_objective_check_filter( ent_objective *objective ){
    if( objective->filter ){
-      struct player_skate_state *s = &localplayer._skate.state;
+      struct player_skate_state *s = &player_skate.state;
       enum trick_type trick = s->trick_type;
 
       u32 state = 0x00;
@@ -93,7 +81,7 @@ VG_STATIC int ent_objective_check_filter( ent_objective *objective ){
    }
 }
 
-VG_STATIC void ent_objective_call( world_instance *world, ent_call *call ){
+static void ent_objective_call( world_instance *world, ent_call *call ){
    u32 index = mdl_entity_id_id( call->id );
    ent_objective *objective = mdl_arritm( &world->ent_objective, index );
 
@@ -107,8 +95,10 @@ VG_STATIC void ent_objective_call( world_instance *world, ent_call *call ){
             ent_objective_pass( world, objective );
          }
          else {
+            audio_lock();
             audio_oneshot_3d( &audio_challenge[6], localplayer.rb.co,
                               30.0f, 1.0f );
+            audio_unlock();
             vg_error( "challenge failed\n" );
             world_static.challenge_target = NULL;
             world_static.challenge_timer = 0.0f;