X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_challenge.c;h=9499d0fed8e7b0e6ce9f51fcd1cf0a161d373c55;hb=f01a25e33a54c92e4d6bca0889b76f33af5e51eb;hp=8f8c277338f3312562591e0b9924a951fd712ba6;hpb=fbe807d19b8a626c2d75002b286dd794f893473a;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/ent_challenge.c b/ent_challenge.c index 8f8c277..9499d0f 100644 --- a/ent_challenge.c +++ b/ent_challenge.c @@ -4,13 +4,15 @@ #include "gui.h" #include "audio.h" -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; @@ -20,10 +22,13 @@ 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_set_focus( call->id ); world_entity_focus_modal(); @@ -35,11 +40,10 @@ 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; } void ent_challenge_preupdate( ent_challenge *challenge, int active )