From: hgn Date: Thu, 19 Jun 2025 20:16:07 +0000 (+0100) Subject: ye X-Git-Url: https://skaterift.com/git/?a=commitdiff_plain;h=606c371fe7ecf724a15de76474288b7196a6b08f;p=carveJwlIkooP6JGAAIwe30JlM.git ye --- diff --git a/src/addon.c b/src/addon.c index 000ec14..2f6173d 100644 --- a/src/addon.c +++ b/src/addon.c @@ -224,16 +224,19 @@ u32 addon_uid_get_custom_part( const char *uid, char out_cpart[ ADDON_CPART_MAX if( begins ) { if( ends ) - { return count; - } else { + out_cpart[0] = '\0'; vg_error( "While extracting custom part from uid '%s', encounted too long custom string.\n", uid ); return 0; } } - else return 0; + else + { + out_cpart[0] = '\0'; + return 0; + } } /* diff --git a/src/ent_route.c b/src/ent_route.c index efdf69c..c82593d 100644 --- a/src/ent_route.c +++ b/src/ent_route.c @@ -167,6 +167,17 @@ void ent_route_leaderboard_ui( ui_context *ctx, ui_rect ref_box, u32 route_index mh = ml-mr, mv = mu-md; + static f32 repeater; + if( repeater > 0.0f ) + { + repeater -= vg_minf( vg.time_frame_delta, 0.5f ); + mv = 0; + mh = 0; + } + else + if( mv || mh ) + repeater += 0.2f; + if( vg_input.display_input_method == k_input_method_controller ) { menu_nav( &_ent_route.cursor[1], mv, _ent_route.entries_max-1 ); diff --git a/src/ent_skateshop.c b/src/ent_skateshop.c index 3573575..e5d2d35 100644 --- a/src/ent_skateshop.c +++ b/src/ent_skateshop.c @@ -567,17 +567,18 @@ void charshop_gui( ui_context *ctx ) mv = mu-md, enter = button_down( k_srbind_maccept ); - i32 R = menu_nav( &_skateshop.charshop_row, mv, _skateshop.charshop_row_max ); - - if( menu.repeater > 0.0f ) + static f32 repeater; + if( repeater > 0.0f ) { - menu.repeater -= vg_minf( vg.time_frame_delta, 0.5f ); + repeater -= vg_minf( vg.time_frame_delta, 0.5f ); mv = 0; mh = 0; } else if( mv || mh ) - menu.repeater += R==0? 0.2f: 0.17f; + repeater += 0.17f; + + i32 R = menu_nav( &_skateshop.charshop_row, mv, _skateshop.charshop_row_max ); ui_rect panel = { 8, 8, 350, vg.window_y }; ui_fill( ctx, panel, ui_opacity( GUI_COL_DARK, 0.35f ) ); diff --git a/src/player_remote.c b/src/player_remote.c index 1cece14..e1e1aff 100644 --- a/src/player_remote.c +++ b/src/player_remote.c @@ -370,13 +370,11 @@ void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ) player->playermodel.cache_slot = addon_cache_create_viewer_from_uid( k_addon_type_player, uid ); char cpart[ ADDON_CPART_MAX ]; - if( addon_uid_get_custom_part( uid, cpart ) ) - playermodel_use_cpart( &player->playermodel, cpart ); + addon_uid_get_custom_part( uid, cpart ); + playermodel_use_cpart( &player->playermodel, cpart ); } else if( item->type_index == k_netmsg_playeritem_world0 ) - { relink_remote_player_worlds( item->client ); - } } else if( tmp->inetmsg_id == k_inetmsg_chat ) { diff --git a/steam_build_script.vdf b/steam_build_script.vdf index a0564c1..f832827 100644 --- a/steam_build_script.vdf +++ b/steam_build_script.vdf @@ -1,31 +1,31 @@ "AppBuild" { - "AppID" "2103940" - "Desc" "SR Multi-build" + "AppID" "2103940" + "Desc" "SR Multi-build" - "ContentRoot" "/home/harry/Documents/carve/dist/" - "BuildOutput" "dist/steam_cache" + "ContentRoot" "/home/harry/Documents/carve/dist/" + "BuildOutput" "dist/steam_cache" - "Depots" - { - "2103942" // Linux Binary - { - "FileMapping" - { - "LocalPath" "bin/skaterift-linux-x86_64-zig-cc/*" - "DepotPath" "." - "recursive" "1" - } - } - "2103941" // Windows Binary - { - "FileMapping" - { - "LocalPath" "bin/skaterift-windows-x86_64-zig-cc/*" - "DepotPath" "." - "recursive" "1" - } - } + "Depots" + { + "2103942" // Linux Binary + { + "FileMapping" + { + "LocalPath" "bin/skaterift-linux-x86_64-zig-cc/*" + "DepotPath" "." + "recursive" "1" + } + } + "2103941" // Windows Binary + { + "FileMapping" + { + "LocalPath" "bin/skaterift-windows-x86_64-zig-cc/*" + "DepotPath" "." + "recursive" "1" + } + } "2103943" // Shared Content { "FileMapping" @@ -44,5 +44,5 @@ "recursive" "0" } } - } + } } diff --git a/steam_demo_build.vdf b/steam_demo_build.vdf index b4f94fb..309b977 100644 --- a/steam_demo_build.vdf +++ b/steam_demo_build.vdf @@ -1,21 +1,21 @@ "AppBuild" { - "AppID" "2720160" - "Desc" "SR Demo" + "AppID" "2720160" + "Desc" "SR Demo" - "ContentRoot" "/home/harry/Documents/carve/dist/" - "BuildOutput" "dist/steam_cache" + "ContentRoot" "/home/harry/Documents/carve/dist/" + "BuildOutput" "dist/steam_cache" - "Depots" - { - "2720161" // Linux Binary - { - "FileMapping" - { - "LocalPath" "bin/skaterift-demo/*" - "DepotPath" "." - "recursive" "1" - } - } - } + "Depots" + { + "2720161" // Linux Binary + { + "FileMapping" + { + "LocalPath" "bin/skaterift-demo/*" + "DepotPath" "." + "recursive" "1" + } + } + } }