fix some problems with world loader

[carveJwlIkooP6JGAAIwe30JlM.git] / world_routes.c

diff --git a/world_routes.c b/world_routes.c
index 48df26729b91483e61c0fd4183e4d4a8f25b4e93..d81419f252852de5e4c575efc41a2656b4f2936e 100644 (file)
--- a/world_routes.c
+++ b/world_routes.c
@@ -21,6 +21,7 @@
 
 #include "shaders/scene_route.h"
 #include "shaders/routeui.h"
+#include "ent_region.h"
 
 static void world_routes_clear( world_instance *world )
 {
@@ -39,16 +40,15 @@ static void world_routes_clear( world_instance *world )
    world_static.last_use = 0.0;
 }
 
-static void world_routes_time_lap( world_instance *world, ent_route *route )
-{
+static void world_routes_time_lap( world_instance *world, ent_route *route ){
    vg_info( "------- time lap %s -------\n", 
             mdl_pstr(&world->meta,route->pstr_name) );
 
    double start_time = 0.0;
    u32 last_version=0;
 
-   u32 valid_count=0;
-   int clean = 1;
+   u32 valid_sections=0;
+   int clean = !localplayer.rewinded_since_last_gate;
 
    for( u32 i=0; i<route->checkpoints_count; i++ ){
       u32 cpid  = (i+route->active_checkpoint) % route->checkpoints_count;
@@ -65,41 +65,44 @@ static void world_routes_time_lap( world_instance *world, ent_route *route )
       if( i == 0 )
          start_time = rg->timing_time;
       else{
-         if( last_version+1 == rg->timing_version ) valid_count ++;
-         else valid_count = 0;
+         if( last_version+1 == rg->timing_version ) valid_sections ++;
+         else valid_sections = 0;
       }
 
       last_version = rg->timing_version;
 
       vg_info( "%u %f [%s]\n", rg->timing_version, rg->timing_time,
-               (rg->flags & k_ent_gate_clean_pass)? "CLEAN": "-----");
+            i? ((rg->flags & k_ent_gate_clean_pass)? "CLEAN": "     "):
+                " N/A ");
 
       if( !(rg->flags & k_ent_gate_clean_pass) )
          clean = 0;
    }
 
    if( world_static.current_run_version == last_version+1 ){
-      valid_count ++;
+      valid_sections ++;
 
       if( route->checkpoints_count == 1 ){
          route->timing_base = world_static.time;
       }
    }
-   else valid_count = 0;
+   else valid_sections = 0;
 
-   vg_info( "%u %f\n", world_static.current_run_version, world_static.time );
+   vg_info( "%u %f [%s]\n", 
+            world_static.current_run_version, world_static.time,
+           !localplayer.rewinded_since_last_gate? "CLEAN": "     " );
 
-   if( valid_count==route->checkpoints_count ){
+   if( valid_sections==route->checkpoints_count ){
       f64 lap_time = world_static.time - start_time;
 
       if( (route->best_laptime == 0.0) || (lap_time < route->best_laptime) ){
          route->best_laptime = lap_time;
-         route->achievment_status |= 0x1;
-
-         if( clean )
-            route->achievment_status |= 0x2;
       }
 
+      route->flags |= k_ent_route_flag_achieve_silver;
+      if( clean ) route->flags |= k_ent_route_flag_achieve_gold;
+      ent_region_re_eval( world );
+
       /* for steam achievements. */
       if( route->anon.official_track_id != 0xffffffff ){
          struct track_info *ti = &track_infos[ route->anon.official_track_id ];
@@ -119,9 +122,9 @@ static void world_routes_time_lap( world_instance *world, ent_route *route )
                                lap_time );
    }
 
-   route->valid_checkpoints = valid_count+1;
+   route->valid_checkpoints = valid_sections+1;
 
-   vg_info( "valid: %u\n", valid_count );
+   vg_info( "valid sections: %u\n", valid_sections );
    vg_info( "----------------------------\n" );
 }
 
@@ -134,13 +137,6 @@ static void world_routes_activate_entry_gate( world_instance *world,
    world_static.last_use = world_static.time;
    ent_gate *dest = mdl_arritm( &world->ent_gate, rg->target );
 
-   if( localplayer.rewinded_since_last_gate ){
-      localplayer.rewinded_since_last_gate = 0;
-      dest->flags &= ~k_ent_gate_clean_pass;
-   }
-   else
-      dest->flags |= k_ent_gate_clean_pass;
-
    for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
       ent_route *route = mdl_arritm( &world->ent_route, i );
 
@@ -169,6 +165,13 @@ static void world_routes_activate_entry_gate( world_instance *world,
    dest->timing_version = world_static.current_run_version;
    dest->timing_time = world_static.time;
 
+   if( localplayer.rewinded_since_last_gate ){
+      localplayer.rewinded_since_last_gate = 0;
+      dest->flags &= ~k_ent_gate_clean_pass;
+   }
+   else
+      dest->flags |= k_ent_gate_clean_pass;
+
    world_static.current_run_version ++;
 }
 
@@ -540,6 +543,12 @@ static void world_gen_routes_ent_init( world_instance *world ){
       ent_route *route = mdl_arritm(&world->ent_route,i);
       mdl_transform_m4x3( &route->anon.transform, route->board_transform );
 
+      route->flags = 0x00;
+      route->best_laptime = 0.0;
+      
+      if( mdl_arrcount(&world->ent_region) )
+         route->flags |= k_ent_route_flag_out_of_zone;
+
       route->anon.official_track_id = 0xffffffff;
       for( u32 j=0; j<vg_list_size(track_infos); j ++ ){
          if( !strcmp(track_infos[j].name,