Merge pull request #148 from BSVino/always-fill-style-bar-after-race

Always fill the style meter after a race
BSVino · Dec 22, 2018 · d3a6c9a · d3a6c9a
2 parents 33a6f39 + 9cbd8b5
commit d3a6c9a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/mp/src/game/server/sdk/sdk_player.cpp b/mp/src/game/server/sdk/sdk_player.cpp
@@ -3996,6 +3996,11 @@ bool CSDKPlayer::UseStylePoints (void)
 	return false;
 }
 
+void CSDKPlayer::FillMeter()
+{
+	m_flStyleSkillCharge = da_stylemetertotalcharge.GetFloat();
+}
+
 void CSDKPlayer::ActivateMeter()
 {
 	if (!UseStylePoints())
@@ -4006,7 +4011,7 @@ void CSDKPlayer::ActivateMeter()
 
 	m_flStylePoints = 0;
 
-	m_flStyleSkillCharge = da_stylemetertotalcharge.GetFloat();
+	FillMeter();
 
 	m_iStyleKillStreak = 0;
 

diff --git a/mp/src/game/server/sdk/sdk_player.h b/mp/src/game/server/sdk/sdk_player.h
@@ -317,6 +317,7 @@ class CSDKPlayer : public CBaseMultiplayerPlayer
 	static int GetStyleStars(float flPoints);
 	int GetStyleStars();
 
+	void FillMeter();
 	void ActivateMeter();
 
 	bool SetCharacter(const char* pszCharacter);

diff --git a/mp/src/game/shared/sdk/sdk_gamerules.cpp b/mp/src/game/shared/sdk/sdk_gamerules.cpp
@@ -2324,6 +2324,8 @@ void CSDKGameRules::GiveMiniObjectiveRewardPlayer(CSDKPlayer* pPlayer)
 	if (!pPlayer->IsStyleSkillActive())
 		pPlayer->ActivateMeter();
 
+	pPlayer->FillMeter();
+
 	if ( pPlayer->Weapon_OwnsThisType("weapon_grenade") )
 		pPlayer->CBasePlayer::GiveAmmo(1, "grenades");
 	else