game: make achievements work without steam

game/client/achievement_notification_panel.cpp

@@ -85,7 +85,7 @@ void CAchievementNotificationPanel::PerformLayout( void )
 	SetBgColor( Color( 0, 0, 0, 0 ) );
 	m_pLabelHeading->SetBgColor( Color( 0, 0, 0, 0 ) );
 	m_pLabelTitle->SetBgColor( Color( 0, 0, 0, 0 ) );
-	m_pPanelBackground->SetBgColor( Color( 62,70,55, 200 ) );
+	m_pPanelBackground->SetBgColor( Color( 128, 128, 128, 128 ) );
 }
 
 //-----------------------------------------------------------------------------
@@ -94,13 +94,14 @@ void CAchievementNotificationPanel::PerformLayout( void )
 void CAchievementNotificationPanel::FireGameEvent( IGameEvent * event )
 {
 	const char *name = event->GetName();
-	if ( 0 == Q_strcmp( name, "achievement_event" ) )
+	if ( Q_strcmp( name, "achievement_event" ) == 0 )
 	{
 		const char *pchName = event->GetString( "achievement_name" );
 		int iCur = event->GetInt( "cur_val" );
 		int iMax = event->GetInt( "max_val" );
 		wchar_t szLocalizedName[256]=L"";
 
+#ifndef DISABLE_STEAM
 		if ( IsPC() )
 		{
 			// shouldn't ever get achievement progress if steam not running and user logged in, but check just in case
@@ -114,7 +115,8 @@ void CAchievementNotificationPanel::FireGameEvent( IGameEvent * event )
 				steamapicontext->SteamUserStats()->IndicateAchievementProgress( pchName, iCur, iMax );
 			}
 		}
-		else 
+		else
+#endif
 		{
 			// on X360 we need to show our own achievement progress UI
 
@@ -125,10 +127,17 @@ void CAchievementNotificationPanel::FireGameEvent( IGameEvent * event )
 			Q_wcsncpy( szLocalizedName, pchLocalizedName, sizeof( szLocalizedName ) );
 
 			// this is achievement progress, compose the message of form: "<name> (<#>/<max>)"
-			wchar_t szFmt[128]=L"";
 			wchar_t szText[512]=L"";
+			wchar_t szFmt[128]=L"";
 			wchar_t szNumFound[16]=L"";
 			wchar_t szNumTotal[16]=L"";
+
+			if( iCur >= iMax )
+			{
+				AddNotification( pchName, g_pVGuiLocalize->Find( "#GameUI_Achievement_Awarded" ), szLocalizedName );
+				return;
+			}
+
 			_snwprintf( szNumFound, ARRAYSIZE( szNumFound ), L"%i", iCur );
 			_snwprintf( szNumTotal, ARRAYSIZE( szNumTotal ), L"%i", iMax );
 
@@ -138,6 +147,7 @@ void CAchievementNotificationPanel::FireGameEvent( IGameEvent * event )
 			Q_wcsncpy( szFmt, pchFmt, sizeof( szFmt ) );
 
 			g_pVGuiLocalize->ConstructString( szText, sizeof( szText ), szFmt, 3, szLocalizedName, szNumFound, szNumTotal );
+
 			AddNotification( pchName, g_pVGuiLocalize->Find( "#GameUI_Achievement_Progress" ), szText );
 		}
 	}
@@ -245,13 +255,13 @@ void CAchievementNotificationPanel::SetXAndWide( Panel *pPanel, int x, int wide
 	pPanel->SetWide( wide );
 }
 
-CON_COMMAND_F( achievement_notification_test, "Test the hud notification UI", FCVAR_CHEAT | FCVAR_DEVELOPMENTONLY )
+CON_COMMAND( achievement_notification_test, "Test the hud notification UI" )
 {
 	static int iCount=0;
 
 	CAchievementNotificationPanel *pPanel = GET_HUDELEMENT( CAchievementNotificationPanel );
 	if ( pPanel )
-	{		
+	{
 		pPanel->AddNotification( "HL2_KILL_ODESSAGUNSHIP", L"Achievement Progress", ( 0 == ( iCount % 2 ) ? L"Test Notification Message A (1/10)" :
 			L"Test Message B" ) );
 	}
@@ -269,4 +279,4 @@ CON_COMMAND_F( achievement_notification_test, "Test the hud notification UI", FC
 #endif
 
 	iCount++;
-}
+}

game/server/wscript

@@ -33,6 +33,8 @@ def configure(conf):
 	game = conf.options.GAMES
 	conf.env.GAMES = game
 
+	conf.env.append_unique('DEFINES', ['DISABLE_STEAM=1'])
+
 	if game not in games.keys():
 		conf.fatal("Couldn't find game: ", game)
 

game/shared/achievementmgr.cpp

@@ -950,8 +950,8 @@ void CAchievementMgr::AwardAchievement( int iAchievementID )
 	SetDirty( true );
 
 	if ( IsPC() )
-	{		
+	{
-#ifndef NO_STEAM
+#ifndef DISABLE_STEAM
 		if ( steamapicontext->SteamUserStats() )
 		{
 			VPROF_BUDGET( "AwardAchievement", VPROF_BUDGETGROUP_STEAM );
@@ -963,8 +963,9 @@ void CAchievementMgr::AwardAchievement( int iAchievementID )
 				m_AchievementsAwarded.AddToTail( iAchievementID );
 			}
 		}
+		m_AchievementsAwarded.AddToTail( iAchievementID );
 #endif
-    }
+	}
 	else if ( IsX360() )
 	{
 #ifdef _X360
@@ -1033,12 +1034,16 @@ extern bool IsInCommentaryMode( void );
 //-----------------------------------------------------------------------------
 bool CAchievementMgr::CheckAchievementsEnabled()
 {
+	return true;
+
 	// if PC, Steam must be running and user logged in
+#ifndef DISABLE_STEAM
 	if ( IsPC() && !LoggedIntoSteam() )
 	{
 		Msg( "Achievements disabled: Steam not running.\n" );
 		return false;
 	}
+#endif
 
 #if defined( _X360 )
 	uint state = XUserGetSigninState( XBX_GetPrimaryUserId() );

game/shared/baseachievement.cpp

@@ -231,7 +231,7 @@ void CBaseAchievement::IncrementCount( int iOptIncrement )
 			Msg( "Achievement count increased for %s: %d/%d\n", GetName(), m_iCount, m_iGoal );
 		}
 
-#ifndef NO_STEAM
+#ifndef DISABLE_STEAM
 		// if this achievement's progress should be stored in Steam, set the steam stat for it
 		if ( StoreProgressInSteam() && steamapicontext->SteamUserStats() )
 		{
@@ -255,7 +255,7 @@ void CBaseAchievement::IncrementCount( int iOptIncrement )
 				AwardAchievement();
 			}
 			else
-			{	
+			{
 				HandleProgressUpdate();
 			}
 		}
@@ -275,20 +275,16 @@ void CBaseAchievement::SetShowOnHUD( bool bShow )
 
 void CBaseAchievement::HandleProgressUpdate()
 {
-	// if we've hit the right # of progress steps to show a progress notification, show it
+	// which notification is this
-	if ( ( m_iProgressMsgIncrement > 0 ) && m_iCount >= m_iProgressMsgMinimum && ( 0 == ( m_iCount % m_iProgressMsgIncrement ) ) )
+	int iProgress = m_iCount / m_iProgressMsgIncrement;
+	// if we haven't already shown this progress step, show it
+	if ( iProgress > m_iProgressShown || m_iCount == 1 )
 	{
-		// which notification is this
+		ShowProgressNotification();
-		int iProgress = m_iCount / m_iProgressMsgIncrement;
+		// remember progress step shown so we don't show it again if the player loads an earlier save game
-		// if we haven't already shown this progress step, show it
+		// and gets past this point again
-		if ( iProgress > m_iProgressShown )
+		m_iProgressShown = iProgress;
-		{
+		m_pAchievementMgr->SetDirty( true );
-			ShowProgressNotification();
-			// remember progress step shown so we don't show it again if the player loads an earlier save game
-			// and gets past this point again
-			m_iProgressShown = iProgress;
-			m_pAchievementMgr->SetDirty( true );
-		}					
 	}
 }
 
@@ -383,6 +379,7 @@ void CBaseAchievement::AwardAchievement()
 	if ( IsAchieved() )
 		return;
 
+	ShowProgressNotification();
 	m_pAchievementMgr->AwardAchievement( m_iAchievementID );
 }
 
@@ -438,7 +435,7 @@ void CBaseAchievement::EnsureComponentBitSetAndEvaluate( int iBitNumber )
 			}
 
 			ShowProgressNotification();
-		}				
+		}
 	}
 	else
 	{
@@ -748,4 +745,4 @@ void CAchievement_AchievedCount::SetAchievementsRequired( int iNumRequired, int
 	m_iNumRequired = iNumRequired;
 	m_iLowRange = iLowRange;
 	m_iHighRange = iHighRange;
-}
+}

game/shared/portal/achievements_portal.cpp

@@ -519,9 +519,11 @@ class CAchievementPortalFindAllDinosaurs : public CBaseAchievement
 			if ( id >= 0 && id < m_iNumComponents )
 			{
 				EnsureComponentBitSetAndEvaluate( id );
-				
+
+#ifndef DISABLE_STEAM
 				// Update our Steam stat
 				steamapicontext->SteamUserStats()->SetStat( "PORTAL_TRANSMISSION_RECEIVED_STAT", m_iCount );
+#endif
 			}
 			else
 			{