Refactor money display string code

Author: Starkku

src/Ext/Building/Body.cpp

@@ -12,19 +12,8 @@ void BuildingExt::ExtData::DisplayGrinderRefund()
 {
 	if (this->AccumulatedGrindingRefund && Unsorted::CurrentFrame % 15 == 0)
 	{
-		int refundAmount = this->AccumulatedGrindingRefund;
-		bool isPositive = refundAmount > 0;
-		auto color = isPositive ? ColorStruct { 0, 255, 0 } : ColorStruct { 255, 0, 0 };
-		auto coords = this->OwnerObject()->GetRenderCoords();
-		int width = 0, height = 0;
-		wchar_t moneyStr[0x20];
-		swprintf_s(moneyStr, L"%ls%ls%d", isPositive ? L"+" : L"-", Phobos::UI::CostLabel, std::abs(refundAmount));
-		BitFont::Instance->GetTextDimension(moneyStr, &width, &height, 120);
-		Point2D pixelOffset = Point2D::Empty;
-		pixelOffset += this->TypeExtData->Grinding_DisplayRefund_Offset;
-		pixelOffset.X -= width / 2;
-
-		FlyingStrings::Add(moneyStr, coords, color, pixelOffset);
+		FlyingStrings::AddMoneyString(this->AccumulatedGrindingRefund, this->OwnerObject()->Owner,
+			this->TypeExtData->Grinding_DisplayRefund_Houses, this->OwnerObject()->GetRenderCoords(), this->TypeExtData->Grinding_DisplayRefund_Offset);
 
 		this->AccumulatedGrindingRefund = 0;
 	}
@@ -256,11 +245,8 @@ bool BuildingExt::DoGrindingExtras(BuildingClass* pBuilding, TechnoClass* pTechn
 	{
 		const auto pTypeExt = pExt->TypeExtData;
 
-		if (pTypeExt->Grinding_DisplayRefund && (pTypeExt->Grinding_DisplayRefund_Houses == AffectedHouse::All ||
-			EnumFunctions::CanTargetHouse(pTypeExt->Grinding_DisplayRefund_Houses, pBuilding->Owner, HouseClass::CurrentPlayer)))
-		{
+		if (pTypeExt->Grinding_DisplayRefund)
 			pExt->AccumulatedGrindingRefund += pTechno->GetRefund();
-		}
 
 		if (pTypeExt->Grinding_Weapon.isset()
 			&& Unsorted::CurrentFrame >= pExt->GrindingWeapon_LastFiredFrame + pTypeExt->Grinding_Weapon.Get()->ROF)

src/Ext/WarheadType/Detonate.cpp

@@ -54,23 +54,10 @@ void WarheadTypeExt::ExtData::Detonate(TechnoClass* pOwner, HouseClass* pHouse,
 		{
 			pHouse->TransactMoney(this->TransactMoney);
 
-			if (this->TransactMoney_Display &&
-				(this->TransactMoney_Display_Houses == AffectedHouse::All ||
-					EnumFunctions::CanTargetHouse(this->TransactMoney_Display_Houses, pHouse, HouseClass::CurrentPlayer)))
+			if (this->TransactMoney_Display)
 			{
-				bool isPositive = this->TransactMoney > 0;
-				auto color = isPositive ? ColorStruct { 0, 255, 0 } : ColorStruct { 255, 0, 0 };
-				wchar_t moneyStr[0x20];
-				swprintf_s(moneyStr, L"%ls%ls%d", isPositive ? L"+" : L"-", Phobos::UI::CostLabel, std::abs(this->TransactMoney));
-				auto displayCoord = this->TransactMoney_Display_AtFirer ? (pOwner ? pOwner->Location : coords) : coords;
-
-				int width = 0, height = 0;
-				BitFont::Instance->GetTextDimension(moneyStr, &width, &height, 120);
-				Point2D pixelOffset = Point2D::Empty;
-				pixelOffset += this->TransactMoney_Display_Offset;
-				pixelOffset.X -= (width / 2);
-
-				FlyingStrings::Add(moneyStr, displayCoord, color, pixelOffset);
+				auto displayCoords = this->TransactMoney_Display_AtFirer ? (pOwner ? pOwner->Location : coords) : coords;
+				FlyingStrings::AddMoneyString(this->TransactMoney, pHouse, this->TransactMoney_Display_Houses, displayCoords, this->TransactMoney_Display_Offset);
 			}
 		}
 

src/Misc/FlyingStrings.cpp

@@ -7,6 +7,7 @@
 #include <Drawing.h>
 #include <ScenarioClass.h>
 #include <BitFont.h>
+#include <Utilities/EnumFunctions.h>
 
 std::vector<FlyingStrings::Item> FlyingStrings::Data;
 
@@ -29,6 +30,24 @@ void FlyingStrings::Add(const wchar_t* text, CoordStruct coords, ColorStruct col
 	Data.push_back(item);
 }
 
+void FlyingStrings::AddMoneyString(int amount, HouseClass* owner, AffectedHouse displayToHouses, CoordStruct coords, Point2D pixelOffset)
+{
+	if (displayToHouses == AffectedHouse::All ||
+		owner && EnumFunctions::CanTargetHouse(displayToHouses, owner, HouseClass::CurrentPlayer))
+	{
+		bool isPositive = amount > 0;
+		ColorStruct color = isPositive ? ColorStruct { 0, 255, 0 } : ColorStruct { 255, 0, 0 };
+		wchar_t moneyStr[0x20];
+		swprintf_s(moneyStr, L"%ls%ls%d", isPositive ? L"+" : L"-", Phobos::UI::CostLabel, std::abs(amount));
+
+		int width = 0, height = 0;
+		BitFont::Instance->GetTextDimension(moneyStr, &width, &height, 120);
+		pixelOffset.X -= (width / 2);
+
+		FlyingStrings::Add(moneyStr, coords, color, pixelOffset);
+	}
+}
+
 void FlyingStrings::UpdateAll()
 {
 	if (Data.empty())

src/Misc/FlyingStrings.h

@@ -7,6 +7,8 @@ By AlexB and Joshy
 #pragma once
 #include <vector>
 #include <ColorScheme.h>
+#include <HouseClass.h>
+#include <Utilities/Enum.h>
 
 class FlyingStrings
 {
@@ -25,9 +27,10 @@ class FlyingStrings
 	static const int Duration = 75;
 	static std::vector<Item> Data;
 
-	static bool DrawAllowed(CoordStruct &nCoords);
+	static bool DrawAllowed(CoordStruct& nCoords);
 
 public:
-	static void Add(const wchar_t *text, CoordStruct coords, ColorStruct color, Point2D pixelOffset = Point2D::Empty);
+	static void Add(const wchar_t* text, CoordStruct coords, ColorStruct color, Point2D pixelOffset = Point2D::Empty);
+	static void AddMoneyString(int amount, HouseClass* owner, AffectedHouse displayToHouses, CoordStruct coords, Point2D pixelOffset = Point2D::Empty);
 	static void UpdateAll();
 };