(50c0271)

[carveJwlIkooP6JGAAIwe30JlM.git] / ent_challenge.c

diff --git a/ent_challenge.c b/ent_challenge.c
index 72149b1a4d4dd72327c01b71ad6207cb8a8b2fbe..9499d0fed8e7b0e6ce9f51fcd1cf0a161d373c55 100644 (file)
--- a/ent_challenge.c
+++ b/ent_challenge.c
@@ -1,17 +1,18 @@
-#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 ){
+entity_call_result 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 );
 
-   if( call->function == 0 ){ /* unlock() */
-      if( !challenge->status ){
+   if( call->function == 0 ) /* unlock() */
+   {
+      if( !challenge->status )
+      {
          vg_info( "challenge( '%s' )\n", 
                   mdl_pstr( &world->meta, challenge->pstr_alias) );
          ent_call call;
@@ -21,12 +22,16 @@ static void ent_challenge_call( world_instance *world, ent_call *call ){
          entity_call( world, &call );
       }
       challenge->status = 1;
+      return k_entity_call_result_OK;
    }
-   else if( call->function == 1 ){  /* view() */
+   else if( call->function == 1 ) /* view() */
+   {
       if( (localplayer.subsystem == k_player_subsystem_walk) &&
-          (world_static.challenge_target == NULL) ){
+          (world_static.challenge_target == NULL) )
+      {
          world_static.challenge_target = NULL;
-         world_entity_focus( call->id );
+         world_entity_set_focus( call->id );
+         world_entity_focus_modal();
 
          gui_helper_clear();
          vg_str text;
@@ -35,14 +40,14 @@ static void ent_challenge_call( world_instance *world, ent_call *call ){
          if( gui_new_helper( input_button_list[k_srbind_mback], &text ))
             vg_strcat( &text, "exit" );
       }
+      return k_entity_call_result_OK;
    }
-   else {
-      vg_print_backtrace();
-      vg_error( "Unhandled function id: %u\n", call->function );
-   }
+   else 
+      return k_entity_call_result_unhandled;
 }
 
-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 */
@@ -66,7 +71,7 @@ static void ent_challenge_preupdate( ent_challenge *challenge, int active ){
       if( min_dist2 > max_dist*max_dist ){
          world_static.challenge_target = NULL;
          world_static.challenge_timer = 0.0f;
-         world_static.focused_entity = 0;
+         world_entity_clear_focus();
          audio_lock();
          audio_oneshot_3d( &audio_challenge[6], localplayer.rb.co,
                            30.0f, 1.0f );
@@ -83,7 +88,7 @@ static void ent_challenge_preupdate( ent_challenge *challenge, int active ){
          world_static.challenge_target = mdl_arritm( &world->ent_objective, 
                                                      index );
          world_static.challenge_timer = 0.0f;
-         world_entity_unfocus();
+         world_entity_exit_modal();
          gui_helper_clear();
 
          u32 next = challenge->first;
@@ -101,9 +106,11 @@ static void ent_challenge_preupdate( ent_challenge *challenge, int active ){
       }
    }
 
-   if( button_down( k_srbind_mback ) ){
+   if( button_down( k_srbind_mback ) )
+   {
       world_static.challenge_target = NULL;
-      world_entity_unfocus();
+      world_entity_exit_modal();
+      world_entity_clear_focus();
       gui_helper_clear();
       audio_lock();
       audio_oneshot( &audio_challenge[4], 1.0f, 0.0f );
@@ -115,5 +122,3 @@ static void ent_challenge_preupdate( ent_challenge *challenge, int active ){
 static void ent_challenge_render( ent_challenge *challenge ){
    
 }
-
-#endif /* ENT_CHALLENGE_C */