fix some problems with world loader

[carveJwlIkooP6JGAAIwe30JlM.git] / player_render.c

diff --git a/player_render.c b/player_render.c
index 13e4ada179505ce5f72ef8b35c267e9be6a8408a..b0416f5f3e927c946ebbe7a7ea6b46719dea1c61 100644 (file)
--- a/player_render.c
+++ b/player_render.c
@@ -15,6 +15,9 @@
 #include "shaders/model_board_view.h"
 #include "depth_compare.h"
 
+#include "network.h"
+#include "player_remote.h"
+
 static void player_load_animation_reference( const char *path ){
    mdl_context *meta = &localplayer.skeleton_meta;
    mdl_open( meta, path, vg_mem.rtmemory );
@@ -86,7 +89,7 @@ static void player_board_load( struct player_board *board,
    dynamic_model_load( &ctx, &board->mdl, path );
 
    mdl_array_ptr markers;
-   mdl_load_array( &ctx, &markers, "ent_marker", vg_mem.scratch );
+   MDL_LOAD_ARRAY( &ctx, &markers, ent_marker, vg_mem.scratch );
 
    /* TODO: you get put into a new section, the above is standard mdl loads. */
    for( int i=0; i<4; i++ )
@@ -299,7 +302,8 @@ static void render_board( camera *cam, world_instance *world,
                           struct player_board_pose *pose,
                           enum board_shader shader )
 {
-   if( !board ) return;
+   if( !board ) 
+      board = &localplayer.fallback_board;
 
    /* TODO: 
     *  adding depth compare to this shader