X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=50b456941c9bde1ee8fc77d1ea4a0c70d130f33b;hb=0c2bc783691adbd29cbb8cbcaed9c09e3c3d96e4;hp=da8a0d3c492f36e0c89d74fd46687cff56181cc7;hpb=254d76308dc12891c65b8fb5d5edae7152164e9a;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/ent_skateshop.c b/ent_skateshop.c index da8a0d3..50b4569 100644 --- 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 ); } @@ -372,7 +367,7 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ if( valid_count && vg_loader_availible() ) browseable = 1; - if( vg_loader_availible() ) + if( valid_count && vg_loader_availible() ) loadable = 1; global_skateshop.helper_browse->greyed = !browseable; @@ -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