ubuntu build script

[carveJwlIkooP6JGAAIwe30JlM.git] / ent_skateshop.c

diff --git a/ent_skateshop.c b/ent_skateshop.c
index 12e89233ab670d36a1537eb62f73b3de413421d3..50b456941c9bde1ee8fc77d1ea4a0c70d130f33b 100644 (file)
--- a/ent_skateshop.c
+++ b/ent_skateshop.c
@@ -64,8 +64,7 @@ static void skateshop_async_preview_imageload( void *data, u32 len ){
          global_skateshop.tex_preview;
    }
    else {
-      skaterift.rt_textures[k_skaterift_rt_workshop_preview] =
-         global_skateshop.tex_preview_err;
+      skaterift.rt_textures[k_skaterift_rt_workshop_preview] = vg.tex_missing;
    }
 
    SDL_AtomicLock( &addon_system.sl_cache_using_resources );
@@ -193,11 +192,8 @@ static void skateshop_init_async(void *_data,u32 size){
    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
 
-   skaterift.rt_textures[ k_skaterift_rt_workshop_preview ] =
-      global_skateshop.tex_preview_err;
-
-   skaterift.rt_textures[ k_skaterift_rt_server_status ] =
-      global_skateshop.tex_preview_err;
+   skaterift.rt_textures[ k_skaterift_rt_workshop_preview ] = vg.tex_missing;
+   skaterift.rt_textures[ k_skaterift_rt_server_status ] = vg.tex_missing;
    render_server_status_gui();
 }
 
@@ -205,7 +201,6 @@ static void skateshop_init_async(void *_data,u32 size){
  * VG event init
  */
 static void skateshop_init(void){
-   vg_tex2d_replace_with_error( &global_skateshop.tex_preview_err );
    vg_async_call( skateshop_init_async, NULL, 0 );
 }
 
@@ -739,6 +734,9 @@ static void skateshop_render_nonfocused( world_instance *world, camera *cam ){
       ent_marker *mark_rack = mdl_arritm( &world->ent_marker, 
                                      mdl_entity_id_id(shop->boards.id_rack));
 
+      if( !mark_rack ) 
+         continue;
+
       u32 slot_count = vg_list_size(global_skateshop.shop_view_slots);
       for( u32 i=0; i<slot_count; i++ ){
          struct player_board *board = &localplayer.fallback_board;