X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=834ede636ab83ec8c6e4d235959e2b352c06f880;hb=02c9203df66d93f21c0e64f51193bcbeaabfc9bd;hp=0e484ed019b2a21fd0983f23812097ca3280b3ee;hpb=cab063a27c067f6b5387305fe358c94fc7793f45;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_entity.c b/world_entity.c index 0e484ed..834ede6 100644 --- a/world_entity.c +++ b/world_entity.c @@ -618,12 +618,6 @@ static void world_entity_start( world_instance *world, vg_msg *sav ){ } } - for( u32 i=0; ient_route); i++ ){ - ent_route *route = mdl_arritm( &world->ent_route, i ); - route->achievment_status = 0; - route->best_laptime = 0.0; - } - vg_msg routes_block = *sav; if( vg_msg_seekframe( &routes_block, "routes" ) ){ for( u32 i=0; ient_route); i++ ){ @@ -632,13 +626,33 @@ static void world_entity_start( world_instance *world, vg_msg *sav ){ vg_msg route_info = routes_block; if( vg_msg_seekframe( &route_info, mdl_pstr(&world->meta,route->pstr_name) ) ){ - route->achievment_status = - vg_msg_getkvu32( &route_info, "achivement_status", 0 ); + route->flags |= vg_msg_getkvu32( &route_info, "flags", 0 ); route->best_laptime = vg_msg_getkvf64( &route_info, "best_laptime", 0.0 ); + + f32 sections[ route->checkpoints_count ]; + vg_msg_cmd cmd; + if( vg_msg_getkvcmd( &route_info, "sections", &cmd ) ){ + vg_msg_cast( cmd.value, cmd.code, sections, + k_vg_msg_f32 | + vg_msg_count_bits(route->checkpoints_count) ); + } + else{ + for( u32 j=0; jcheckpoints_count; j ++ ) + sections[j] = 0.0f; + } + + for( u32 j=0; jcheckpoints_count; j ++ ){ + ent_checkpoint *cp = mdl_arritm( &world->ent_checkpoint, + route->checkpoints_start + j ); + + cp->best_time = sections[j]; + } } } } + + ent_region_re_eval( world ); } static void world_entity_serialize( world_instance *world, vg_msg *sav ){ @@ -656,8 +670,20 @@ static void world_entity_serialize( world_instance *world, vg_msg *sav ){ vg_msg_frame( sav, mdl_pstr( &world->meta, route->pstr_name ) ); { - vg_msg_wkvu32( sav, "achivement_status", route->achievment_status ); + vg_msg_wkvu32( sav, "flags", route->flags ); vg_msg_wkvf64( sav, "best_laptime", route->best_laptime ); + + f32 sections[ route->checkpoints_count ]; + + for( u32 j=0; jcheckpoints_count; j ++ ){ + ent_checkpoint *cp = mdl_arritm( &world->ent_checkpoint, + route->checkpoints_start + j ); + + sections[j] = cp->best_time; + } + + vg_msg_wkvnum( sav, "sections", k_vg_msg_f32, + route->checkpoints_count, sections ); } vg_msg_end_frame( sav ); }