X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_miniworld.c;h=2fed03137313e7549a36cfee7939cd716ca2491c;hb=refs%2Fheads%2Fmaster;hp=fcdba0b12c20cf62967d84c6037cda3ab9d97fe1;hpb=14851c4c820eb07a0db0ec0366a70bdd6518c331;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/ent_miniworld.c b/ent_miniworld.c index fcdba0b..2fed031 100644 --- a/ent_miniworld.c +++ b/ent_miniworld.c @@ -9,14 +9,15 @@ struct global_miniworld global_miniworld; -void ent_miniworld_call( world_instance *world, ent_call *call ) +entity_call_result ent_miniworld_call( world_instance *world, ent_call *call ) { ent_miniworld *miniworld = mdl_arritm( &world->ent_miniworld, mdl_entity_id_id(call->id) ); int world_id = world - world_static.instances; - if( call->function == 0 ){ /* zone() */ + if( call->function == 0 ) /* zone() */ + { const char *uid = mdl_pstr( &world->meta, miniworld->pstr_world ); skaterift_load_world_command( 1, (const char *[]){ uid } ); @@ -28,17 +29,25 @@ void ent_miniworld_call( world_instance *world, ent_call *call ) if( gui_new_helper( input_button_list[k_srbind_miniworld_resume], &text )) vg_strcat( &text, "Enter World" ); + + return k_entity_call_result_OK; } - else if( call->function == 1 ){ + else if( call->function == 1 ) + { global_miniworld.active = NULL; gui_helper_clear(); - if( miniworld->proxy ){ + if( miniworld->proxy ) + { ent_prop *prop = mdl_arritm( &world->ent_prop, mdl_entity_id_id(miniworld->proxy) ); prop->flags &= ~0x1; } + + return k_entity_call_result_OK; } + else + return k_entity_call_result_unhandled; } static void miniworld_icon( vg_camera *cam, enum gui_icon icon,