nonlocal stuff again

[carveJwlIkooP6JGAAIwe30JlM.git] / player_model.h

diff --git a/player_model.h b/player_model.h
index 5982eaeb8f21c8abfdde34c064d7c80cd760ad13..2567a83aac42668c46843d73e0cb4519b27536c1 100644 (file)
--- a/player_model.h
+++ b/player_model.h
@@ -28,6 +28,8 @@ struct player_avatar
        id_head,
        id_ik_foot_l,
        id_ik_foot_r,
+       id_ik_knee_l,
+       id_ik_knee_r,
        id_wheel_l,
        id_wheel_r,
        id_board;
@@ -42,9 +44,10 @@ VG_STATIC void player_avatar_load( struct player_avatar *av, const char *path )
    /* load in reference player model, with animations and such */
    /* FIXME: This is allocated as un-freeable systems memory */
 
-   mdl_open( &av->meta, path );
-   mdl_load_metadata( &av->meta, vg_mem.rtmemory );
-   mdl_load_anim_data( &av->meta, vg_mem.rtmemory );
+   mdl_open( &av->meta, path, vg_mem.rtmemory );
+   mdl_load_metadata_block( &av->meta, vg_mem.rtmemory );
+   mdl_load_animation_block( &av->meta, vg_mem.rtmemory );
+   mdl_close( &av->meta );
 
    struct skeleton *sk = &av->sk;
    skeleton_setup( sk, vg_mem.rtmemory, &av->meta );
@@ -60,6 +63,8 @@ VG_STATIC void player_avatar_load( struct player_avatar *av, const char *path )
    av->id_board      = skeleton_bone_id( sk, "board" );
    av->id_wheel_l    = skeleton_bone_id( sk, "wheel.L" );
    av->id_wheel_r    = skeleton_bone_id( sk, "wheel.R" );
+   av->id_ik_knee_l  = skeleton_bone_id( sk, "knee.L" );
+   av->id_ik_knee_r  = skeleton_bone_id( sk, "knee.R" );
 }
 
 #if 0