Skip to content

[TF] Restore cut MvM Upgrade Station music. #1553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

[TF] Restore cut MvM Upgrade Station music. #1553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a3d004
[TF] Restore cut MvM upgrade station music.
Bitl Oct 14, 2025
3e6d2b0
Create tf_music_upgrade_machine.wav
Bitl Oct 14, 2025
d95fff7
turn on upgrade machine music by default
Bitl Oct 14, 2025
1074d46
Update c_tf_upgrades.cpp
Bitl Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added game/mod_tf/sound/items/tf_music_upgrade_machine.wav
View file
Open in desktop
Binary file not shown.
31 changes: 29 additions & 2 deletions src/game/client/tf/player_vs_environment/c_tf_upgrades.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@
#include "tf_hud_statpanel.h"
#include "tf_mann_vs_machine_stats.h"
#include "c_tf_playerresource.h"
#include "soundenvelope.h"

#define UPGRADE_PANEL_LEVEL_LABEL_COUNT 10


extern CAchievementMgr g_AchievementMgrTF;

ConVar tf_mvm_tabs_discovered( "tf_mvm_tabs_discovered", "0", FCVAR_ARCHIVE, "Remember how many times players have clicked tabs." );
ConVar tf_mvm_play_music( "tf_mvm_play_music", "1", FCVAR_ARCHIVE, "Play the MvM upgrade station music." );

Color CUpgradeBuyPanel::m_rgbaDefaultFG( 0, 0, 0, 255 );
Color CUpgradeBuyPanel::m_rgbaDefaultBG( 0, 0, 0, 255 );
Expand Down Expand Up @@ -614,9 +616,22 @@ void CHudUpgradePanel::OnTick( void )

if ( m_hPlayer )
{
if ( !m_hPlayer->m_Shared.IsInUpgradeZone() && !m_bInspectMode )
if ( !m_bInspectMode )
{
OnCommand( "cancel" );
if ( m_hPlayer->m_Shared.IsInUpgradeZone())
{
if ( !m_pMvMUpgradeMachineLoop && tf_mvm_play_music.GetBool() )
{
CSoundEnvelopeController &controller = CSoundEnvelopeController::GetController();
CLocalPlayerFilter filter;
m_pMvMUpgradeMachineLoop = controller.SoundCreate( filter, m_hPlayer->entindex(), "music.mvm_upgrade_machine" );
controller.Play( m_pMvMUpgradeMachineLoop, 1.0, 100 );
}
}
else
{
OnCommand( "cancel" );
}
}

if ( m_pPlayerRespecButton && g_TF_PR && m_hPlayer )
Expand Down Expand Up @@ -1973,6 +1988,12 @@ void CHudUpgradePanel::OnCommand( const char *command )
{
if ( !Q_stricmp( command, "close" ) )
{
if ( m_pMvMUpgradeMachineLoop )
{
CSoundEnvelopeController::GetController().SoundDestroy( m_pMvMUpgradeMachineLoop );
m_pMvMUpgradeMachineLoop = NULL;
}

m_bShowUpgradeMenu = false;
m_bCancelUpgrades = false;
m_bOpenLoadout = false;
Expand All @@ -1991,6 +2012,12 @@ void CHudUpgradePanel::OnCommand( const char *command )
}
else if ( !Q_stricmp( command, "cancel" ) )
{
if ( m_pMvMUpgradeMachineLoop )
{
CSoundEnvelopeController::GetController().SoundDestroy( m_pMvMUpgradeMachineLoop );
m_pMvMUpgradeMachineLoop = NULL;
}

m_bShowUpgradeMenu = false;
m_bCancelUpgrades = true;
m_bOpenLoadout = false;
Expand Down
1 change: 1 addition & 0 deletions src/game/client/tf/player_vs_environment/c_tf_upgrades.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ class CHudUpgradePanel : public CHudElement, public vgui::EditablePanel
private:
void UpdateTip();
CHandle< C_TFPlayer > m_hPlayer;
CSoundPatch* m_pMvMUpgradeMachineLoop;
};


Expand Down