From 194bf621f6f83717c3383de3963d02a4b1627a34 Mon Sep 17 00:00:00 2001 From: hgn Date: Tue, 17 Jun 2025 02:22:05 +0100 Subject: [PATCH] small fumos --- .../playermodels/sr2t/ch_sr2t.mdl | Bin 463112 -> 463208 bytes src/ent_skateshop.c | 15 +++++++++------ src/player_remote.c | 5 ++++- src/save.c | 9 ++++++--- src/skaterift.c | 2 +- src/world_volumes.c | 3 ++- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/content_skaterift/playermodels/sr2t/ch_sr2t.mdl b/content_skaterift/playermodels/sr2t/ch_sr2t.mdl index d6a248efe2b861797c58f52a3344e769c2027935..399381aec113b23e8592454ef4ee9da103594460 100644 GIT binary patch delta 17671 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 PpkPg)eoeAwq3(YGu~;UU delta 16664 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 == k_skateshop_type_charshop ) { - struct addon_cache *cache = &_addon.cache[ k_addon_type_player ]; - addon_cache_entry *cache_entry = vg_pool_item( &cache->pool, localplayer.playermodel.cache_slot ); - u32 index; - if( _addon_get_filtered_index( k_addon_type_player, cache_entry->addon_id, 0, ADDON_REG_HIDDEN, &index ) ) + u32 index = 0; + + if( localplayer.playermodel.cache_slot ) { + struct addon_cache *cache = &_addon.cache[ k_addon_type_player ]; + addon_cache_entry *cache_entry = vg_pool_item( &cache->pool, localplayer.playermodel.cache_slot ); + if( _addon_get_filtered_index( k_addon_type_player, cache_entry->addon_id, 0, ADDON_REG_HIDDEN, &index ) ) + { + } } - else index = 0; _skateshop.selected_player_index = index; } else @@ -574,7 +577,7 @@ void charshop_gui( ui_context *ctx ) } else if( mv || mh ) - menu.repeater += R==0? 0.2f: 0.1f; + menu.repeater += R==0? 0.2f: 0.17f; 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 7de565d..1cece14 100644 --- a/src/player_remote.c +++ b/src/player_remote.c @@ -32,7 +32,10 @@ static void player_remote_clear( u32 player_index ) { if( player_index == netplayers.spectate_index ) { - skaterift.activity = k_skaterift_default; + menu_close(); /* sets state to default */ + menu_open( k_menu_page_quick ); + gui_helper_reset( k_gui_helper_mode_clear ); + localplayer.immobile = 0; } } } diff --git a/src/save.c b/src/save.c index 005c25f..8a8cfe5 100644 --- a/src/save.c +++ b/src/save.c @@ -176,9 +176,12 @@ static void equip_async( vg_async_task *task ) playermodel_use_cpart( &localplayer.playermodel, info->player_cpart ); /* kinda jank.. */ - struct addon_cache *cache = &_addon.cache[ k_addon_type_player ]; - addon_cache_entry *cache_entry = vg_pool_item( &cache->pool, localplayer.playermodel.cache_slot ); - memcpy( cache_entry->local_cpart, info->player_cpart, ADDON_CPART_MAX ); + if( info->player_id ) + { + struct addon_cache *cache = &_addon.cache[ k_addon_type_player ]; + addon_cache_entry *cache_entry = vg_pool_item( &cache->pool, localplayer.playermodel.cache_slot ); + memcpy( cache_entry->local_cpart, info->player_cpart, ADDON_CPART_MAX ); + } } void skaterift_load_mainsave(void) diff --git a/src/skaterift.c b/src/skaterift.c index 9e9fe12..4ac7b01 100644 --- a/src/skaterift.c +++ b/src/skaterift.c @@ -253,7 +253,7 @@ void vg_pre_update(void) vg_audio_lock(); vg_audio_oneshot( &audio_ui[3], 1.0f, 0.0f, 0, 0 ); vg_audio_unlock(); - menu_close(); + menu_close(); /* sets tate to default*/ menu_open( k_menu_page_quick ); gui_helper_reset( k_gui_helper_mode_clear ); localplayer.immobile = 0; diff --git a/src/world_volumes.c b/src/world_volumes.c index 8fe7ed2..1c82529 100644 --- a/src/world_volumes.c +++ b/src/world_volumes.c @@ -162,7 +162,8 @@ next_volume:; gui_helper_reset( k_gui_helper_mode_clear ); } } - else if( button_down( k_srbind_maccept ) && (_cutscene.state == k_cutscene_state_none) ) + else if( button_down( k_srbind_maccept ) && (_cutscene.state == k_cutscene_state_none) + && !(skaterift.activity & (k_skaterift_menu|k_skaterift_spectate|k_skaterift_replay)) ) { srinput.state = k_input_state_resume; if( !(volume->flags & k_ent_volume_flag_repeatable) ) -- 2.25.1