reset run when using lgider

[carveJwlIkooP6JGAAIwe30JlM.git] / ent_skateshop.c

diff --git a/ent_skateshop.c b/ent_skateshop.c
index eb30ad464ac4eb78fe9d54a1ca0bbff3060dca35..85a0fa48b5fda101d32380f03790b9ca3c3532df 100644 (file)
--- a/ent_skateshop.c
+++ b/ent_skateshop.c
@@ -10,7 +10,6 @@
 #include "player.h"
 #include "gui.h"
 #include "menu.h"
-#include "highscores.h"
 #include "steam.h"
 #include "addon.h"
 #include "save.h"
@@ -64,8 +63,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,18 +191,15 @@ 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();
 }
 
 /*
  * 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 );
 }
 
@@ -223,10 +218,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" );
+   }
 }
 
 /*
@@ -371,7 +371,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;
@@ -412,9 +412,9 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){
       }
    }
    else if( shop->type == k_skateshop_type_server ){
-      f64 delta = vg.time - network_client.last_intent_change;
+      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;
@@ -628,21 +628,32 @@ static void skateshop_render_worldshop( ent_skateshop *shop ){
 
       addon_reg *reg = get_addon_from_index( k_addon_type_world,
             global_skateshop.selected_world_id, ADDON_REG_HIDDEN );
-      vg_msg msg;
-      vg_msg_init( &msg, reg->metadata, reg->metadata_len );
 
-      global_skateshop.render.world_loc = vg_msg_getkvstr( &msg, "location" );
-      global_skateshop.render.world_reg = global_skateshop.selected_world_id;
+      if( !reg ) 
+         goto none;
 
-      if( vg_msg_seekframe( &msg, "workshop" ) ){
-         global_skateshop.render.world_title = vg_msg_getkvstr( &msg, "title");
-         vg_msg_skip_frame( &msg );
+      if( reg->alias.workshop_id ){
+         vg_msg msg;
+         vg_msg_init( &msg, reg->metadata, reg->metadata_len );
+
+         global_skateshop.render.world_loc = vg_msg_getkvstr(&msg,"location");
+         global_skateshop.render.world_reg = global_skateshop.selected_world_id;
+
+         if( vg_msg_seekframe( &msg, "workshop" ) ){
+            global_skateshop.render.world_title = vg_msg_getkvstr(&msg,"title");
+            vg_msg_skip_frame( &msg );
+         }
+         else {
+            vg_warn( "No workshop body\n" );
+         }
       }
       else {
-         vg_warn( "No workshop body\n" );
+         global_skateshop.render.world_title = reg->alias.foldername;
       }
    }
 
+none:;
+
    /* Text */
    char buftext[128], bufsubtext[128];
    vg_str info, subtext;
@@ -714,6 +725,40 @@ static void skateshop_render( ent_skateshop *shop ){
       vg_fatal_error( "Unknown store (%u)\n", shop->type );
 }
 
+static void skateshop_render_nonfocused( world_instance *world, camera *cam ){
+   for( u32 j=0; j<mdl_arrcount( &world->ent_skateshop ); j ++ ){
+      ent_skateshop *shop = mdl_arritm(&world->ent_skateshop, j );
+
+      if( shop->type != k_skateshop_type_boardshop ) continue;
+
+      f32 dist2 = v3_dist2( cam->pos, shop->transform.co ),
+          maxdist = 50.0f;
+
+      if( dist2 > maxdist*maxdist ) continue;
+      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;
+
+         mdl_transform xform;
+         transform_identity( &xform );
+
+         xform.co[0] = -((float)i - ((float)slot_count)*0.5f)*0.45f;
+         mdl_transform_mul( &mark_rack->transform, &xform, &xform );
+
+         struct player_board_pose pose = {0};
+         m4x3f mmdl;
+         mdl_transform_m4x3( &xform, mmdl );
+         render_board( cam, world, board, mmdl, &pose, k_board_shader_entity );
+      }
+   }
+}
+
 static void ent_skateshop_helpers_pickable( const char *acceptance ){
    vg_str text;
 
@@ -766,6 +811,8 @@ static void ent_skateshop_call( world_instance *world, ent_call *call ){
          vg_str text;
          global_skateshop.helper_pick = gui_new_helper(
                      input_button_list[k_srbind_maccept], &text);
+         if( gui_new_helper( input_button_list[k_srbind_mback], &text ))
+            vg_strcat( &text, "exit" );
          skateshop_server_helper_update();
       }
    }