From 249fe329869e43961d4e1d4e44f08c6225e195c7 Mon Sep 17 00:00:00 2001
From: hgn <hgodden00@gmail.com>
Date: Tue, 11 Apr 2023 20:39:11 +0100
Subject: [PATCH] small bugs

---
 blender_export.py      |   2 +-
 maps_src/mp_mtzero.mdl | Bin 16925128 -> 16925120 bytes
 skaterift.c            |   4 ++--
 world_routes.h         |  19 ++++++++++++++-----
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/blender_export.py b/blender_export.py
index f9b225d..eed99af 100644
--- a/blender_export.py
+++ b/blender_export.py
@@ -2041,7 +2041,7 @@ class SR_OT_ROUTE_LIST_DEL_ITEM(bpy.types.Operator):
    @classmethod 
    def poll(cls, context):#{
       active_object = context.active_object
-      if obj_ent_type(active_object) == 'ent_gate':#{
+      if obj_ent_type(active_object) == 'ent_route':#{
          return active_object.SR_data.ent_route[0].gates
       #}
       else: return False
diff --git a/maps_src/mp_mtzero.mdl b/maps_src/mp_mtzero.mdl
index 29b4aff015d6603d6c9778832e41672e23411ad5..4eb90fc07f37f99a2e8694f9e3452809319d5e83 100644
GIT binary patch
delta 1169
zcmWmDX_(Cg6bIn@zseFRB&M+>DoUl0vW_C!qq1u-u5HX<nqln2kOtYVx?0Fi$(kCZ
zD9R8~3Pp=7MaWk6<@MqHo#**I=X^YQ**OK*vLr8vD;5fc@)Jo-PfY3-NlNbBt9xpC
zD3lQ08^i}4qL*Y=G%g%pHfwBPFBGawO6Q)5$&vnD(mJL@u60?_X5siCA(|qmXXk`-
zbHc&kv{;dhpmuK4j9^?4gkwAV1`C5iv620P#X;d%%}k@{r~{b+Ve)Yu*OQ+D6r>P0
zP?#dz$hEthxS3)Urv$f9l3OW7Y2vtzc*;<ga+K$GDsTrCsl=V!#obh<3iog?Rk@G*
zd4Os>$U{`81~qw@T0Fv|)TRz~sYiVpkU&Eo<8d0%m?vmLQ=a50p5_^z<vE_`1)9;E
z7kP=7X+cX`(V8~2r5){gg+w~gkxnGhnFw9zN;kUGgJgP=LMpxJO&`*Dm2@)bOFuH{
z&j1E8h`|hDC|L|+IN6L~B(E`w*U4ctV;IXDjAJ|#n8+leOy*7ABE}Tn<{jSUJ*F~^
z_nFQNW-^P}%waC`n9m1%$O1lMA&Xed5|*-zk6F$qd`d1WSjj3rV>O@i1#4K#mwd%K
z*7G&ruz@@_vWaim%oe_5E8F;<AK1>1{KO7+vWuVjh28AoSAOGn{$MYEvXA{7;2?kT
sH-|XPKOEsG$M~1yoZuv<IL&|j&l%2gj`LjLBA2+#l`(#Q4Z*&=tA>z|1poj5

delta 1173
zcmWmDd3?_W7zgn0_qQB5I!LS~m0Xn^DV3|}SSe>Jk)`=DW}~$+w9v$cBER@0mHP_O
zq2&mLjB-_UITA&uax2Q)AMeledVOBc^XIcBzp!*MONzt93PBK*B$}C>lA0DxP4C~Y
zcV>1FB**rJNnu*-tSpEnMv|%)j1BDtL2WX6^i4^R4(gfJJtKO)D~Pp^B!$Vb3^^~q
zFj7<)3G=cNf}m17At!8B)I28~ABG9>tpmbEVVQW|z;JO`E?zg+xOmj=+>i(fTtEp*
zQi{@CNEymfj`Cc@`P)mllnPYjGAeO7m8n7^SCGV&ROKqFaW&U)E!DY>8q}l~wW-7P
z+`x_0<tFM;p9VDKW*Tt|x6+u~xScy_LQ|U2oEF^4U9_YXcXJQ-av#au&jYmPK^~$F
zZD~h)I?$1a>BJ*E%42lqak|izC+J2BPtu*INTml+deVzDdeet=`jSB={piorWbq8y
z<S>AN<T8lC4B=Vwc#feAV>r)~&j?;%B%>&xkkO1`EHCmB;~3A&Od!T9Ok@&qUS%?`
zF@@K8gEyJVG^R6ynapA~bC}CK=JOT{SjZyYW-&{6hj)38_gTsZ6!9U;Sk4Mo@)4_8
z%^E)D6V|eh^?b?(irL5}KI3yXvxTi}V>@5)C10_FoqWwVe9L!y&n|YehrRs3K7M3B
z2l$DfImjV?;a7g+cmCi{4)Yg(bA+QD<2WZc$th0r5C3w8v;4>ZWBmSV!u`eP0E#e&
AEC2ui

diff --git a/skaterift.c b/skaterift.c
index 8b909d2..1d8e564 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -246,8 +246,8 @@ VG_STATIC void vg_load(void)
    /* 'systems' are completely loaded now */
 
    /* load home world */
-   world_load( &world_global.worlds[0], "maps/mp_gridmap.mdl" );
-   //world_load( &world_global.worlds[0], "maps/mp_mtzero.mdl" );
+   //world_load( &world_global.worlds[0], "maps/mp_gridmap.mdl" );
+   world_load( &world_global.worlds[0], "maps/mp_mtzero.mdl" );
 
 #if 0
    world_load( &world_global.worlds[1], "maps/mp_gridmap.mdl" );
diff --git a/world_routes.h b/world_routes.h
index e47ebe2..df758da 100644
--- a/world_routes.h
+++ b/world_routes.h
@@ -84,13 +84,17 @@ VG_STATIC void world_routes_time_lap( world_instance *world, ent_route *route )
    u32 valid_count=0;
 
    for( u32 i=0; i<route->checkpoints_count; i++ ){
-      u32 cpid  = route->checkpoints_start+(i+route->active_checkpoint);
-          cpid  = cpid % route->checkpoints_count;
+      u32 cpid  = (i+route->active_checkpoint) % route->checkpoints_count;
+          cpid += route->checkpoints_start;
 
       ent_checkpoint *cp = mdl_arritm( &world->ent_checkpoint, cpid );
       ent_gate *rg = mdl_arritm( &world->ent_gate, cp->gate_index );
                 rg = mdl_arritm( &world->ent_gate, rg->target );
 
+      if( i == 1 ){
+         route->timing_base = rg->timing_time;
+      }
+
       if( i == 0 )
          start_time = rg->timing_time;
       else{
@@ -99,10 +103,16 @@ VG_STATIC void world_routes_time_lap( world_instance *world, ent_route *route )
       }
 
       last_version = rg->timing_version;
-      vg_info( "%u %f\n", rg->timing_version, rg->timing_time );
+      vg_info( "%u %f\n", rg, rg->timing_version, rg->timing_time );
    }
 
-   if( world_global.current_run_version == last_version+1 ) valid_count ++;
+   if( world_global.current_run_version == last_version+1 ){
+      valid_count ++;
+
+      if( route->checkpoints_count == 1 ){
+         route->timing_base = world_global.time;
+      }
+   }
    else valid_count = 0;
 
    vg_info( "%u %f\n", world_global.current_run_version, world_global.time );
@@ -113,7 +123,6 @@ VG_STATIC void world_routes_time_lap( world_instance *world, ent_route *route )
    }
 
    route->valid_checkpoints = valid_count+1;
-   route->timing_base = start_time;
 
    vg_info( "valid: %u\n", valid_count );
    vg_info( "----------------------------\n" );
-- 
2.25.1