menu fixes

Author: mastercoms

src/game/client/tf/clientmode_tf.cpp

@@ -78,6 +78,7 @@
 #include "client_virtualreality.h"
 
 #include "econ_gcmessages.h"
+#include "gamestate/gamestate.h"
 
 #if defined( _X360 )
 #include "tf_clientscoreboard.h"
@@ -395,6 +396,7 @@ ClientModeTFNormal::ClientModeTFNormal()
 	m_bInitializedHudAspect = false;
 
 	m_flLastSlaughterTime = -1.0f;
+	m_flCurMaxFPS = -1.0f;
 
 #if defined( _X360 )
 	m_pScoreboard = NULL;
@@ -1544,8 +1546,13 @@ void ClientModeTFNormal::FireGameEvent( IGameEvent *event )
 	{
 		m_eConnectState = k_eConnectState_Connecting;
 		m_bPendingRichPresenceUpdate = true;
+		// TODO(mcoms): test out always restricting info panel
+#if 0
 		const char *pchSource = event->GetString( "source" );
 		m_bRestrictInfoPanel = pchSource && ( FStrEq( "matchmaking", pchSource ) || !Q_strncmp( pchSource, "quickplay_", 10 ) );
+#else
+		m_bRestrictInfoPanel = true;
+#endif
 
 		m_bInfoPanelShown = false;
 	}
@@ -1977,6 +1984,12 @@ void ClientModeTFNormal::Update()
 		UpdateSteamRichPresence();
 	}
 
+	if ( m_eLastConnectState != m_eConnectState )
+	{
+		OnConnectStateChanged();
+		m_eLastConnectState = m_eConnectState;
+	}
+
 	TFModalStack()->Update();
 
 	NotificationQueue_Update();
@@ -2209,6 +2222,47 @@ bool ClientModeTFNormal::IsTauntSelectPanelVisible() const
 	return m_pMenuTauntSelection && m_pMenuTauntSelection->IsVisible();
 }
 
+//----------------------------------------------------------------------------
+void ClientModeTFNormal::OnConnectStateChanged()
+{
+	static ConVarRef fps_max( "fps_max" );
+	static ConVarRef ui_fps_max( "ui_fps_max" );
+
+	switch ( m_eConnectState )
+	{
+		case k_eConnectState_Connecting:
+		{
+			if ( m_flCurMaxFPS < 0.0f )
+			{
+				m_flCurMaxFPS = fps_max.GetFloat();
+			}
+			// while loading, keep it at our lowest
+			fps_max.SetValue( 30.0f );
+			break;
+		}
+		case k_eConnectState_Connected:
+		{
+			// after loading, restore it.
+			Assert( m_flCurMaxFPS >= 0.0f );
+			fps_max.SetValue( m_flCurMaxFPS >= 0.0f ? m_flCurMaxFPS : 1000.0f );
+			m_flCurMaxFPS = -1.0f;
+			break;
+		}
+		default:
+		{
+			if ( m_flCurMaxFPS < 0.0f )
+			{
+				m_flCurMaxFPS = fps_max.GetFloat();
+			}
+			// if not in game, set fps_max to UI mode.
+			fps_max.SetValue( ui_fps_max.GetFloat() );
+			break;
+		}
+	}
+
+	GetGameStateManager()->QueueEvent( "ingame", m_eConnectState == k_eConnectState_Connected ? "1" : "0" );
+}
+
 //----------------------------------------------------------------------------
 void ClientModeTFNormal::UpdateSteamRichPresence() const
 {

src/game/client/tf/clientmode_tf.h

@@ -92,6 +92,8 @@ DECLARE_CLASS( ClientModeTFNormal, ClientModeShared );
 	bool IsSpyDisguiseVisible() const;
 	bool IsUpgradePanelVisible() const;
 	bool IsTauntSelectPanelVisible() const;
+	
+	void OnConnectStateChanged();
 
 	void UpdateSteamRichPresence() const;
 	// Given a client state, match group loc token and pretty map name, build a localized status line.
@@ -141,18 +143,23 @@ DECLARE_CLASS( ClientModeTFNormal, ClientModeShared );
 
 	bool m_bInitializedHudAspect;
 
-	enum EConnectState {
+	enum EConnectState
+	{
+		k_eConnectState_Uninitialized,
 		k_eConnectState_Disconnected,
 		k_eConnectState_Connecting,
 		k_eConnectState_Connected,
 	};
-	EConnectState			m_eConnectState           = k_eConnectState_Disconnected;
+	EConnectState			m_eConnectState				= k_eConnectState_Disconnected;
+	EConnectState			m_eLastConnectState			= k_eConnectState_Uninitialized;
 	// Valid only when m_eConnectState >= k_eConnectState_Connected
 	// This is the base name of a map, and doesn't include workshop decorations/path/etc.
 	char					m_szMapBaseName[MAX_MAP_NAME] = { 0 };
 
 	float					m_flNextAllowedHighFiveHintTime;
 
+	float					m_flCurMaxFPS = -1.0f;
+
 	// When game events should trigger updates, we want to let all other systems think first (e.g. partyclient) as their
 	// state is looked at by the update loop.  Setting this triggers an update on next think.
 	bool					m_bPendingRichPresenceUpdate = false;

src/game/client/tf/tf_hud_mainmenuoverride.cpp

@@ -192,10 +192,6 @@ CHudMainMenuOverride::CHudMainMenuOverride( IViewPort *pViewPort ) : BaseClass(
 	m_flPlayMusicTime = -1.0f;
 	m_iPlayMusicFrame = 0;
 
-	m_bInGame = false;
-	m_bIsConnectedOnly = true; // start true so we go to false
-	m_flCurMaxFPS = -1.0f;
-
 	m_iCharacterImageIdx = -1;
 
 	m_pCharacterModelPanel = NULL;
@@ -350,19 +346,23 @@ void CHudMainMenuOverride::OnTick()
 	{
 		if ( m_pMainMenuWebUi )
 		{
-			const bool bShouldWebUiShow = bInGame ? enginevgui->IsGameUIVisible() : !bIsConnected;
+			const bool bShouldWebUiShow = ( bInGame && !bBackgroundLevel ) ? enginevgui->IsGameUIVisible() : ( !bIsConnected || bBackgroundLevel );
+
+			if ( GetGameStateManager()->IsReady() )
+			{
+				m_pMainMenuWebUi->LoadInteractivePanel();
+			}
 
 			if ( m_pMainMenuWebUi->IsVisible() != bShouldWebUiShow )
 			{
-				if ( !bShouldWebUiShow )
-				{
-					GetGameStateManager()->QueueEvent( "closedmenu", "" );
-				}
-				else if ( GetGameStateManager()->IsReady() )
+				if ( GetGameStateManager()->IsReady() )
 				{
-					m_pMainMenuWebUi->LoadInteractivePanel();
+					if ( !bShouldWebUiShow )
+					{
+						GetGameStateManager()->QueueEvent( "closedmenu", "" );
+					}
+					m_pMainMenuWebUi->SetVisible( bShouldWebUiShow );
 				}
-				m_pMainMenuWebUi->SetVisible( bShouldWebUiShow );
 			}
 		}
 	}
@@ -377,8 +377,6 @@ void CHudMainMenuOverride::OnTick()
 			engine->ExecuteClientCmd( CFmtStr( "connect %s -%s\n", szConnectAdr, "ConnectStringOnCommandline" ) );
 		}
 	}
-
-
 }
 
 //-----------------------------------------------------------------------------
@@ -1448,47 +1446,6 @@ void CHudMainMenuOverride::OnUpdateMenu( void )
 		}
 	}
 
-	static ConVarRef fps_max("fps_max");
-	static ConVarRef ui_fps_max("ui_fps_max");
-	if ( m_bInGame != ( bInGame && bIsConnected ) )
-	{
-		m_bInGame = bInGame;
-		GetGameStateManager()->QueueEvent( "ingame", m_bInGame ? "1" : "0" );
-		
-		if ( m_bInGame )
-		{
-			// after loading, restore it.
-			fps_max.SetValue( m_flCurMaxFPS >= 0.0f ? m_flCurMaxFPS : 1000.0f );
-			m_flCurMaxFPS = -1.0f;
-		}
-	}
-
-	if ( m_bIsConnectedOnly != ( !bInGame && bIsConnected ) )
-	{
-		m_bIsConnectedOnly = ( !bInGame && bIsConnected );
-		if ( m_bIsConnectedOnly )
-		{
-			if ( m_flCurMaxFPS < 0.0f )
-			{
-				m_flCurMaxFPS = fps_max.GetFloat();
-			}
-			// while loading, keep it at our lowest
-			fps_max.SetValue( 30.0f );
-		}
-		// TODO(mcoms): ui_fps_max
-#if 0
-		else
-		{
-			if ( m_flCurMaxFPS < 0.0f )
-			{
-				m_flCurMaxFPS = fps_max.GetFloat();
-			}
-			// if not in game, set fps_max to UI mode.
-			fps_max.SetValue( ui_fps_max.GetFloat() );
-		}
-#endif
-	}
-
 	// Position the entries
 	FOR_EACH_VEC( m_pMMButtonEntries, i )
 	{

src/game/client/tf/tf_hud_mainmenuoverride.h

@@ -201,10 +201,6 @@ class CHudMainMenuOverride : public vgui::EditablePanel, public IViewPortPanel,
 	float					m_flPlayMusicTime;
 	int32					m_iPlayMusicFrame;
 
-	bool					m_bInGame;
-	bool					m_bIsConnectedOnly;
-	float					m_flCurMaxFPS;
-
 	CInteractiveWebPanel* m_pMainMenuWebUi;
 
 	int						m_MainMenuWebUiZIndex;

src/game/shared/gamestate/gamestate.cpp

@@ -212,6 +212,7 @@ class CHTTPServerThread : public CThread
 				{
 					// should never happen.
 					Assert( 0 );
+					DevMsg( "connected clients empty!\n" );
 					m_connectedClients.push_back( &conn );
 				}
 				int64_t clientId = GetClientId( conn );
@@ -220,6 +221,7 @@ class CHTTPServerThread : public CThread
 					// immediately send back a message for closing
 					crow::json::wvalue resp;
 					resp["i"] = id;
+					DevMsg( "ack: disconnect\n" );
 					conn.send_text( resp.dump() );
 					m_iPrivilegedClientId = 0;
 					return;
@@ -229,6 +231,7 @@ class CHTTPServerThread : public CThread
 					// immediately send back a message for subscribing
 					crow::json::wvalue resp;
 					resp["i"] = id;
+					DevMsg( "ack: subscribe\n" );
 					conn.send_text( resp.dump() );
 					if ( m_iPrivilegedClientId != clientId )
 					{
@@ -242,6 +245,7 @@ class CHTTPServerThread : public CThread
 					// immediately send back a message for unsubscribing
 					crow::json::wvalue resp;
 					resp["i"] = id;
+					DevMsg( "ack: unsubscribe\n" );
 					conn.send_text( resp.dump() );
 					m_SubscribedClientIds.erase( clientId );
 					if ( m_SubscribedClientIds.size() < 1 )
@@ -310,6 +314,7 @@ class CHTTPServerThread : public CThread
 					{
 						if ( conn )
 						{
+							DevMsg( "ret(%d): %s\n", pReturn->m_iRpcId, pReturn->m_strValue );
 							conn->send_text( data.dump() );
 						}
 					}
@@ -343,6 +348,7 @@ class CHTTPServerThread : public CThread
 							int64_t clientId = GetClientId( *conn );
 							if ( ( bUnprivileged || m_iPrivilegedClientId == clientId ) && ( !bNeedsSubscription || m_SubscribedClientIds.find(clientId) != m_SubscribedClientIds.end() ) )
 							{
+								DevMsg( "send: %s(%s)\n", pEvent->m_strEvent.c_str(), pEvent->m_strParams.c_str() );
 								conn->send_text( data.dump() );
 							}
 						}