Fixed buildstate dispenser icon showing the SG

Added support for per-level SG icons
fortressforever · Nov 1, 2020 · 8a3953c · 8a3953c
1 parent 5b5a9bb
commit 8a3953c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/cl_dll/ff/ff_hud_buildstate_dispenser.cpp b/cl_dll/ff/ff_hud_buildstate_dispenser.cpp
@@ -142,7 +142,7 @@ void CHudBuildStateDispenser::VidInit()
 		tempString = L"DISPENSER";
 
 	SetHeaderText(tempString);
-	SetHeaderIconChar("S");
+	SetHeaderIconChar("Y");
 
 	m_qbDispenserHealth->SetLabelText("#FF_ITEM_HEALTH");
 	m_qbDispenserHealth->SetIconChar(":");

diff --git a/cl_dll/ff/ff_hud_buildstate_sentry.cpp b/cl_dll/ff/ff_hud_buildstate_sentry.cpp
@@ -142,7 +142,7 @@ void CHudBuildStateSentry::VidInit()
 		tempString = L"SENTRY";
 
 	SetHeaderText(tempString);
-	SetHeaderIconChar("R");
+	SetHeaderIconChar("Z");
 
 	m_qbSentryHealth->SetLabelText("#FF_ITEM_HEALTH");
 	m_qbSentryHealth->SetIconChar(":");
@@ -206,6 +206,8 @@ void CHudBuildStateSentry::OnTick()
 		SetVisible(false);
 		m_qbSentryHealth->SetVisible(false);
 		m_qbSentryLevel->SetVisible(false);
+		// reset to level 1 icon
+		SetHeaderIconChar("A");
 	}
 	else if(bBuilt && !m_bBuilt)
 	//show quantity bars
@@ -247,6 +249,20 @@ void CHudBuildStateSentry::MsgFunc_SentryMsg(bf_read &msg)
     int iMaxHealth = (int) msg.ReadByte();
 	int iLevel = (int) msg.ReadByte();
 
+	// set icon according to SG level
+	switch(iLevel)
+	{
+	case 2: // level 2
+		SetHeaderIconChar("B");
+		break;
+	case 3: // level 3
+		SetHeaderIconChar("C");
+		break;
+	default: // level 1 or unknown level
+		SetHeaderIconChar("A");
+		break;
+	}
+
 	m_qbSentryLevel->SetAmount(iLevel);
 	m_qbSentryHealth->SetAmount((int)((float)iHealth/100 * iMaxHealth));
 	m_qbSentryHealth->SetAmountMax(iMaxHealth);