X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=251a58595addae93f9f51c241159612c811c04cb;hb=38514b4ba03412ad51df02dc2ba345e1be41005d;hp=12e89233ab670d36a1537eb62f73b3de413421d3;hpb=fbc68c65e01838feb77f47b30994b45fcc39ebaf;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/ent_skateshop.c b/ent_skateshop.c
index 12e8923..251a585 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 );
 }
 
@@ -224,10 +219,15 @@ static void skateshop_server_helper_update(void){
    vg_strnull( &text, global_skateshop.helper_toggle->text, 
                sizeof(global_skateshop.helper_toggle->text) );
 
-   if( network_client.user_intent == k_server_intent_online )
-      vg_strcat( &text, "Disconnect" );
-   else
-      vg_strcat( &text, "Go Online" );
+   if( skaterift.demo_mode ){
+      vg_strcat( &text, "Not availible in demo" );
+   }
+   else {
+      if( network_client.user_intent == k_server_intent_online )
+         vg_strcat( &text, "Disconnect" );
+      else
+         vg_strcat( &text, "Go Online" );
+   }
 }
 
 /*
@@ -415,7 +415,7 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){
    else if( shop->type == k_skateshop_type_server ){
       f64 delta = vg.time_real - network_client.last_intent_change;
 
-      if( delta > 5.0 ){
+      if( (delta > 5.0) && (!skaterift.demo_mode) ){
          global_skateshop.helper_pick->greyed = 0;
          if( button_down( k_srbind_maccept ) ){
             network_client.user_intent = !network_client.user_intent;
@@ -739,6 +739,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;