#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;
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();
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 )
+void ent_challenge_preupdate( ent_focus_context *ctx )
{
- world_instance *world = world_current_instance();
+ world_instance *world = ctx->world;
+ ent_challenge *challenge = mdl_arritm( &world->ent_challenge, ctx->index );
/* maximum distance from active challenge */
- if( !active ){
+ if( !ctx->active )
+ {
f32 min_dist2 = 999999.9f;
- if( mdl_entity_id_type( challenge->first ) == k_ent_objective ){
+ if( mdl_entity_id_type( challenge->first ) == k_ent_objective )
+ {
u32 next = challenge->first;
while( mdl_entity_id_type(next) == k_ent_objective ){
u32 index = mdl_entity_id_id( next );