X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;fp=ent_skateshop.c;h=1065d4b58ab6a1095cd7d3d7f26e2cf1a5261780;hb=f01a25e33a54c92e4d6bca0889b76f33af5e51eb;hp=d5128f0302a447f77ffb5d439bbb65512689edc3;hpb=fbe807d19b8a626c2d75002b286dd794f893473a;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/ent_skateshop.c b/ent_skateshop.c index d5128f0..1065d4b 100644 --- a/ent_skateshop.c +++ b/ent_skateshop.c @@ -797,18 +797,20 @@ static void world_scan_thread( void *_args ) /* * Entity logic: entrance event */ -void ent_skateshop_call( world_instance *world, ent_call *call ) +entity_call_result ent_skateshop_call( world_instance *world, ent_call *call ) { u32 index = mdl_entity_id_id( call->id ); ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, index ); vg_info( "skateshop_call\n" ); - if( skaterift.activity != k_skaterift_default ) return; - if( !vg_loader_availible() ) return; + if( (skaterift.activity != k_skaterift_default) || + !vg_loader_availible() ) + return k_entity_call_result_invalid; if( call->function == k_ent_function_trigger ) { - if( localplayer.subsystem != k_player_subsystem_walk ) return; + if( localplayer.subsystem != k_player_subsystem_walk ) + return k_entity_call_result_OK; vg_info( "Entering skateshop\n" ); @@ -840,5 +842,8 @@ void ent_skateshop_call( world_instance *world, ent_call *call ) vg_strcat( &text, "exit" ); skateshop_server_helper_update(); } + return k_entity_call_result_OK; } + else + return k_entity_call_result_unhandled; }