X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_walk.c;h=ec025a17630e4e52bf2cb77d7982802ed4abdfd1;hb=25bf60849a782d43d886ed182c0c85b87cf87ab9;hp=ad58c7317617e21aea774d125d0c2dd6a007e5e7;hpb=22f62f001f21d1b91fefd9fc495c122d9ddf205a;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_walk.c b/player_walk.c
index ad58c73..ec025a1 100644
--- a/player_walk.c
+++ b/player_walk.c
@@ -282,7 +282,7 @@ static void player__walk_pre_update(void){
                localplayer.immobile = 1;
 
                struct player_avatar *av = localplayer.playeravatar;
-               m4x3_mulv( av->sk.final_mtx[ av->id_ik_foot_r ], 
+               m4x3_mulv( localplayer.final_mtx[ av->id_ik_foot_r ], 
                           av->sk.bones[ av->id_ik_foot_r ].co, 
                           w->state.drop_in_foot_anchor );
             }
@@ -617,9 +617,9 @@ static void player__walk_update(void){
       }
    }
 
-   ent_gate *gate = 
-      world_intersect_gates( world, localplayer.rb.co, w->state.prev_pos );
-   if( gate ){
+   u32 id = world_intersect_gates(world, localplayer.rb.co, w->state.prev_pos);
+   if( id ){
+      ent_gate *gate = mdl_arritm( &world->ent_gate, mdl_entity_id_id(id) );
       m4x3_mulv( gate->transport, localplayer.rb.co, localplayer.rb.co );
       m3x3_mulv( gate->transport, localplayer.rb.v,  localplayer.rb.v );
 
@@ -628,7 +628,7 @@ static void player__walk_update(void){
       q_mul( transport_rotation, localplayer.rb.q, localplayer.rb.q );
 
       rb_update_transform( &localplayer.rb );
-      player__pass_gate( gate );
+      player__pass_gate( id );
    }
    rb_update_transform( &localplayer.rb );
 }