basic npc

[carveJwlIkooP6JGAAIwe30JlM.git] / ent_challenge.c

diff --git a/ent_challenge.c b/ent_challenge.c
index b8f2f5e27ef6a083c822557455df179a44115222..c2ee3b6434eb163fc2687efa247f49ced237716c 100644 (file)
--- a/ent_challenge.c
+++ b/ent_challenge.c
@@ -1,12 +1,11 @@
-#ifndef ENT_CHALLENGE_C
-#define ENT_CHALLENGE_C
-
+#include "vg/vg_engine.h"
 #include "entity.h"
 #include "input.h"
 #include "gui.h"
 #include "audio.h"
 
-static void ent_challenge_call( world_instance *world, ent_call *call ){
+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 );
 
@@ -42,7 +41,8 @@ static void ent_challenge_call( world_instance *world, ent_call *call ){
    }
 }
 
-static void ent_challenge_preupdate( ent_challenge *challenge, int active ){
+void ent_challenge_preupdate( ent_challenge *challenge, int active )
+{
    world_instance *world = world_current_instance();
 
    /* maximum distance from active challenge */
@@ -67,8 +67,10 @@ 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;
    }
@@ -92,7 +94,9 @@ 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;
       }
    }
@@ -101,7 +105,9 @@ static void ent_challenge_preupdate( ent_challenge *challenge, int active ){
       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;
    }
 }
@@ -109,5 +115,3 @@ static void ent_challenge_preupdate( ent_challenge *challenge, int active ){
 static void ent_challenge_render( ent_challenge *challenge ){
    
 }
-
-#endif /* ENT_CHALLENGE_C */