X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=962edf4b28f092a6562bb087f23f2569fcc6c6cb;hb=d3021395f97b2ae244835c6656008386c8874343;hp=427347d430379a153f2b1206f396a804d5744cb4;hpb=abc4dcca885e5a0bc45322c60b040841f69bbc58;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/ent_skateshop.c b/ent_skateshop.c index 427347d..962edf4 100644 --- a/ent_skateshop.c +++ b/ent_skateshop.c @@ -113,9 +113,10 @@ static void skateshop_init(void){ } static u16 skateshop_selected_cache_id(void){ - if( addon_count(k_addon_type_board) ){ - addon_reg *reg = get_addon_from_index(k_addon_type_board, - global_skateshop.selected_board_id); + if( addon_count(k_addon_type_board, ADDON_REG_HIDDEN) ){ + addon_reg *reg = get_addon_from_index( + k_addon_type_board, global_skateshop.selected_board_id, + ADDON_REG_HIDDEN ); return reg->cache_id; } else return 0; @@ -176,10 +177,9 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ } } + u32 valid_count = addon_count( k_addon_type_board, 0 ); if( button_down( k_srbind_mright ) ){ - if( global_skateshop.selected_board_id+1 < - addon_count(k_addon_type_board) ) - { + if( global_skateshop.selected_board_id+1 < valid_count ){ global_skateshop.selected_board_id ++; } } @@ -188,7 +188,6 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ if( opage != npage ){ skateshop_update_viewpage(); - //skateshop_op_processview(); } else if( cache_id && button_down( k_srbind_maccept )){ vg_info( "chose board from skateshop (%u)\n", @@ -209,22 +208,21 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ if( !vg_loader_availible() ) return; int changed = 0; + u32 valid_count = addon_count( k_addon_type_player, ADDON_REG_HIDDEN ); if( button_down( k_srbind_mleft ) ){ if( global_skateshop.selected_player_id > 0 ){ global_skateshop.selected_player_id --; } else{ - global_skateshop.selected_player_id = - addon_count(k_addon_type_player) -1; + global_skateshop.selected_player_id = valid_count-1; } changed = 1; } if( button_down( k_srbind_mright ) ){ - if( global_skateshop.selected_player_id+1 < - addon_count(k_addon_type_player) ){ + if( global_skateshop.selected_player_id+1 < valid_count ){ global_skateshop.selected_player_id ++; } else{ @@ -235,8 +233,14 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ } if( changed ){ - player__use_model( global_skateshop.selected_player_id ); - //skateshop_op_processview(); + addon_reg *addon = get_addon_from_index( + k_addon_type_player, global_skateshop.selected_player_id, + ADDON_REG_HIDDEN ); + + u32 real_id = get_index_from_addon( + k_addon_type_player, addon ); + + player__use_model( real_id ); } if( button_down( k_srbind_maccept ) ){ @@ -249,10 +253,12 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ int browseable = 0, loadable = 0; - if( addon_count(k_addon_type_world) && vg_loader_availible() ) + u32 valid_count = addon_count( k_addon_type_world, ADDON_REG_HIDDEN ); + + if( valid_count && vg_loader_availible() ) browseable = 1; - if( vg_loader_availible() && global_skateshop.selected_world_id > 0 ) + if( vg_loader_availible() ) loadable = 1; global_skateshop.helper_browse->greyed = !browseable; @@ -269,54 +275,21 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ } if( button_down( k_srbind_mright ) ){ - if( global_skateshop.selected_world_id+1 < - addon_count(k_addon_type_world) ) - { + if( global_skateshop.selected_world_id+1 < valid_count ){ global_skateshop.selected_world_id ++; change = 1; } } } - -#if 0 - if( change && pointcloud_idle() ){ - pointcloud_animate( k_pointcloud_anim_hiding ); - } - if( vg_loader_availible() ){ - addon_reg *reg = get_addon_from_index( k_addon_type_world, - global_skateshop.selected_world_id ); - - /* automatically load in clouds */ - if( loadable && button_down( k_srbind_maccept ) ){ - vg_info( "Select rift (%u)\n", - global_skateshop.selected_world_id ); - skaterift_change_world_start( reg ); - return; - } - else{ - if( pointcloud.anim == k_pointcloud_anim_idle_closed ){ - if( global_skateshop.pointcloud_world_id != - global_skateshop.selected_world_id ) - { - global_skateshop.pointcloud_world_id = - global_skateshop.selected_world_id; - skateshop_load_world_preview( reg ); - } - else{ - pointcloud_animate( k_pointcloud_anim_opening ); - } - } - else if( pointcloud.anim == k_pointcloud_anim_idle_open ){ - if( global_skateshop.pointcloud_world_id != - global_skateshop.selected_world_id ) - { - pointcloud_animate( k_pointcloud_anim_hiding ); - } - } + if( loadable ){ + if( button_down( k_srbind_maccept ) ){ + skaterift_change_world_start( + get_addon_from_index( k_addon_type_world, + global_skateshop.selected_world_id, + ADDON_REG_HIDDEN )); } } -#endif } else{ vg_fatal_error( "Unknown store (%u)\n", shop->type ); @@ -417,14 +390,14 @@ fade_out:; mlocal[3][2] = -0.7f; m4x3_mul( mrack, mlocal, mmdl ); - if( addon_count(k_addon_type_board) ){ + u32 valid_count = addon_count(k_addon_type_board,0); + if( valid_count ){ char buf[16]; - int i=0; - i+=highscore_intl( buf+i, global_skateshop.selected_board_id+1, 3 ); - buf[i++] = '/'; - i+=highscore_intl( buf+i, addon_count(k_addon_type_board), 3 ); - buf[i++] = '\0'; - + vg_str str; + vg_strnull( &str, buf, sizeof(buf) ); + vg_strcati32( &str, global_skateshop.selected_board_id+1 ); + vg_strcatch( &str, '/' ); + vg_strcati32( &str, valid_count ); font3d_simple_draw( 0, buf, &skaterift.cam, mmdl ); } else{ @@ -501,12 +474,13 @@ static void skateshop_render_worldshop( ent_skateshop *shop ){ mdl_entity_id_id(shop->boards.id_info)); if( global_skateshop.render.world_reg != global_skateshop.selected_world_id){ - global_skateshop.render.world_title = ""; + global_skateshop.render.world_title = "missing: workshop.title"; addon_reg *reg = get_addon_from_index( k_addon_type_world, - global_skateshop.selected_world_id ); + 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; @@ -514,6 +488,9 @@ static void skateshop_render_worldshop( ent_skateshop *shop ){ global_skateshop.render.world_title = vg_msg_getkvstr( &msg, "title"); vg_msg_skip_frame( &msg ); } + else { + vg_warn( "No workshop body\n" ); + } } /* Text */ @@ -522,25 +499,20 @@ static void skateshop_render_worldshop( ent_skateshop *shop ){ vg_strnull( &info, buftext, 128 ); vg_strnull( &subtext, bufsubtext, 128 ); - if( addon_count(k_addon_type_world) ){ - addon_reg *reg = get_addon_from_index( k_addon_type_world, - global_skateshop.selected_world_id ); - - info.i+=highscore_intl( info.buffer+info.i, - global_skateshop.selected_world_id+1, 3 ); - info.buffer[info.i++] = '/'; - info.i+=highscore_intl( info.buffer+info.i, - addon_count(k_addon_type_world), 3 ); - info.buffer[info.i++] = ' '; - info.buffer[info.i] = '\0'; - + u32 valid_count = addon_count(k_addon_type_world,ADDON_REG_HIDDEN); + if( valid_count ){ + vg_strcati32( &info, global_skateshop.selected_world_id+1 ); + vg_strcatch( &info, '/' ); + vg_strcati32( &info, valid_count ); + vg_strcatch( &info, ' ' ); vg_strcat( &info, global_skateshop.render.world_title ); + if( !vg_loader_availible() ){ vg_strcat( &subtext, "Loading..." ); } else{ addon_reg *reg = get_addon_from_index( k_addon_type_world, - global_skateshop.selected_world_id ); + global_skateshop.selected_world_id, ADDON_REG_HIDDEN ); if( reg->alias.workshop_id ) vg_strcat( &subtext, "(Workshop) " ); @@ -549,10 +521,9 @@ static void skateshop_render_worldshop( ent_skateshop *shop ){ } } else{ - vg_strcat( &info, "No worlds installed" ); + vg_strcat( &info, "No workshop worlds installed" ); } - m4x3f mtext,mlocal,mtextmdl; mdl_transform_m4x3( &mark_info->transform, mtext );