X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=02bbeb2b342d26141ef52c4a674688106cc50732;hb=74b2136d5b41b18e2eec698f1fd11b503aa1100a;hp=04bbec9891749740e2cc8d51534e710b16371077;hpb=baad90d065899a833390f2f0535cd1fa7799e275;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_entity.c b/world_entity.c index 04bbec9..02bbeb2 100644 --- a/world_entity.c +++ b/world_entity.c @@ -81,12 +81,14 @@ static void world_entity_focus_preupdate(void){ /* additional renderings like text etc.. */ static void world_entity_focus_render(void){ - if( skaterift.activity != k_skaterift_ent_focus ) + world_instance *world = world_current_instance(); + if( skaterift.activity != k_skaterift_ent_focus ){ + skateshop_render_nonfocused( world, &skaterift.cam ); return; + } u32 type = mdl_entity_id_type( world_static.focused_entity ), index = mdl_entity_id_id( world_static.focused_entity ); - world_instance *world = world_current_instance(); if( type == k_ent_skateshop ){ ent_skateshop *skateshop = mdl_arritm( &world->ent_skateshop, index ); @@ -558,6 +560,29 @@ static void entity_bh_debug( void *user, u32 item_index ){ } } +static void update_ach_models(void){ + world_instance *hub = &world_static.instances[k_world_purpose_hub]; + if( hub->status != k_world_status_loaded ) return; + + for( u32 i=0; ient_prop ); i ++ ){ + ent_prop *prop = mdl_arritm( &hub->ent_prop, i ); + if( prop->flags & 0x2 ){ + if( MDL_CONST_PSTREQ( &hub->meta, prop->pstr_alias, "MARC" ) ) + if( skaterift.achievements & 0x1 ) + prop->flags &= ~0x1; + if( MDL_CONST_PSTREQ( &hub->meta, prop->pstr_alias, "ALBERT" ) ) + if( skaterift.achievements & 0x2 ) + prop->flags &= ~0x1; + if( MDL_CONST_PSTREQ( &hub->meta, prop->pstr_alias, "JANET" ) ) + if( skaterift.achievements & 0x4 ) + prop->flags &= ~0x1; + if( MDL_CONST_PSTREQ( &hub->meta, prop->pstr_alias, "BERNADETTA" ) ) + if( skaterift.achievements & 0x8 ) + prop->flags &= ~0x1; + } + } +} + static void entity_bh_closest( void *user, u32 item_index, v3f point, v3f closest ){ world_instance *world = user; @@ -650,7 +675,7 @@ static void world_entity_start( world_instance *world, vg_msg *sav ){ } /* LEGACY: check if steam achievements can give us a medal */ - if( steam_ready && steam_stats_ready ){ + if( steam_ready && steam_stats_ready ){ for( u32 j=0; jname,