ye

diff --git a/src/addon.c b/src/addon.c
index 000ec1433fedd12b3238188da2203ebe7418485f..2f6173df35af974edcfd4f592c133fb3f75c3b6b 100644 (file)
--- 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 efdf69c60dfbebcd29b9461c27c1f86e769fae67..c82593d29ca9a139c91ecaec8de7f14f11d2020e 100644 (file)
--- 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 357357510e8de465f3fd53b838ee513865da4910..e5d2d3509a3c9ea4b58546e474a5285e1361ae83 100644 (file)
--- 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 1cece1477228e701f317aa284902fd6cd3a63636..e1e1aff9d4ffff7f95f86cd7c4ab213cb65da862 100644 (file)
--- 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 a0564c1094e0c8bae3aad2ace959921b21d95aec..f832827a63b0d24bf9acca2f1b40f2860e6c3cc6 100644 (file)
--- a/steam_build_script.vdf
+++ b/steam_build_script.vdf
@@ -1,31 +1,31 @@
 "AppBuild"\r
 {\r
-       "AppID" "2103940"\r
-       "Desc" "SR Multi-build"\r
+   "AppID" "2103940"\r
+   "Desc" "SR Multi-build"\r
 \r
-       "ContentRoot" "/home/harry/Documents/carve/dist/"\r
-       "BuildOutput" "dist/steam_cache"\r
+   "ContentRoot" "/home/harry/Documents/carve/dist/"\r
+   "BuildOutput" "dist/steam_cache"\r
 \r
-       "Depots"\r
-       {\r
-               "2103942" // Linux Binary\r
-               {\r
-                       "FileMapping"\r
-                       {\r
-                               "LocalPath" "bin/skaterift-linux-x86_64-zig-cc/*"\r
-                               "DepotPath" "."\r
-                               "recursive" "1"\r
-                       }\r
-               }\r
-               "2103941" // Windows Binary\r
-               {\r
-                       "FileMapping"\r
-                       {\r
-                               "LocalPath" "bin/skaterift-windows-x86_64-zig-cc/*"\r
-                               "DepotPath" "."\r
-                               "recursive" "1"\r
-                       }\r
-               }\r
+   "Depots"\r
+   {\r
+      "2103942" // Linux Binary\r
+      {\r
+         "FileMapping"\r
+         {\r
+            "LocalPath" "bin/skaterift-linux-x86_64-zig-cc/*"\r
+            "DepotPath" "."\r
+            "recursive" "1"\r
+         }\r
+      }\r
+      "2103941" // Windows Binary\r
+      {\r
+         "FileMapping"\r
+         {\r
+            "LocalPath" "bin/skaterift-windows-x86_64-zig-cc/*"\r
+            "DepotPath" "."\r
+            "recursive" "1"\r
+         }\r
+      }\r
       "2103943" // Shared Content\r
       {\r
          "FileMapping"\r
@@ -44,5 +44,5 @@
             "recursive" "0"\r
          }\r
       }\r
-       }\r
+   }\r
 }\r

diff --git a/steam_demo_build.vdf b/steam_demo_build.vdf
index b4f94fb99d7eeebeca51ec66b8ceabcc48d6f983..309b977f2ca80f86c0355bc6870b749fd617d3df 100644 (file)
--- a/steam_demo_build.vdf
+++ b/steam_demo_build.vdf
@@ -1,21 +1,21 @@
 "AppBuild"\r
 {\r
-       "AppID" "2720160"\r
-       "Desc" "SR Demo"\r
+   "AppID" "2720160"\r
+   "Desc" "SR Demo"\r
 \r
-       "ContentRoot" "/home/harry/Documents/carve/dist/"\r
-       "BuildOutput" "dist/steam_cache"\r
+   "ContentRoot" "/home/harry/Documents/carve/dist/"\r
+   "BuildOutput" "dist/steam_cache"\r
 \r
-       "Depots"\r
-       {\r
-               "2720161" // Linux Binary\r
-               {\r
-                       "FileMapping"\r
-                       {\r
-                               "LocalPath" "bin/skaterift-demo/*"\r
-                               "DepotPath" "."\r
-                               "recursive" "1"\r
-                       }\r
-               }\r
-       }\r
+   "Depots"\r
+   {\r
+      "2720161" // Linux Binary\r
+      {\r
+         "FileMapping"\r
+         {\r
+            "LocalPath" "bin/skaterift-demo/*"\r
+            "DepotPath" "."\r
+            "recursive" "1"\r
+         }\r
+      }\r
+   }\r
 }\r