SHP is valueable and nullable

Author: Thrifinesma

src/Ext/Rules/Body.cpp

@@ -74,18 +74,10 @@ void RulesExt::ExtData::LoadBeforeTypeData(RulesClass* pThis, CCINIClass* pINI)
 	this->PlacementGrid_TranslucentLevel.Read(exINI, "AudioVisual", "BuildingPlacementGrid.TranslucentLevel");
 	this->BuildingPlacementPreview_TranslucentLevel.Read(exINI, "AudioVisual", "BuildingPlacementPreview.DefaultTranslucentLevel");
 	this->Pips_Shield.Read(exINI, "AudioVisual", "Pips.Shield");
-	this->Pips_Shield_Background_Filename.Read(pINI, "AudioVisual", "Pips.Shield.Background");
+	this->Pips_Shield_Background.Read(exINI, "AudioVisual", "Pips.Shield.Background");
 	this->Pips_Shield_Building.Read(exINI, "AudioVisual", "Pips.Shield.Building");
 	this->Pips_Shield_Building_Empty.Read(exINI, "AudioVisual", "Pips.Shield.Building.Empty");
 
-	if (this->Pips_Shield_Background_Filename)
-	{
-		char filename[0x20];
-		strcpy(filename, this->Pips_Shield_Background_Filename);
-		_strlwr_s(filename);
-		this->Pips_Shield_Background_SHP = FileSystem::LoadSHPFile(filename);
-	}
-
 	// Section AITargetTypes
 	int itemsCount = pINI->GetKeyCount(sectionAITargetTypes);
 	for (int i = 0; i < itemsCount; ++i)
@@ -181,8 +173,7 @@ void RulesExt::ExtData::Serialize(T& Stm)
 		.Process(this->PlacementGrid_TranslucentLevel)
 		.Process(this->BuildingPlacementPreview_TranslucentLevel)
 		.Process(this->Pips_Shield)
-		.Process(this->Pips_Shield_Background_Filename)
-		.Process(this->Pips_Shield_Background_SHP)
+		.Process(this->Pips_Shield_Background)
 		.Process(this->Pips_Shield_Building)
 		.Process(this->Pips_Shield_Building_Empty)
 		;

src/Ext/Rules/Body.h

@@ -37,8 +37,7 @@ class RulesExt
 		Valueable<int> PlacementGrid_TranslucentLevel;
 		Valueable<int> BuildingPlacementPreview_TranslucentLevel;
 		Valueable<Vector3D<int>> Pips_Shield;
-		PhobosFixedString<32u> Pips_Shield_Background_Filename;
-		SHPStruct* Pips_Shield_Background_SHP;
+		Nullable<SHPStruct*> Pips_Shield_Background;
 		Valueable<Vector3D<int>> Pips_Shield_Building;
 		Nullable<int> Pips_Shield_Building_Empty;
 
@@ -50,12 +49,11 @@ class RulesExt
 			, JumpjetAllowLayerDeviation { true }
 			, JumpjetTurnToTarget { false }
 			, MissingCameo { "xxicon.shp" }
-			, PlacementGrid_TranslucentLevel{ 0 }
+			, PlacementGrid_TranslucentLevel { 0 }
 			, BuildingPlacementPreview_TranslucentLevel { 3 }
-			, Pips_Shield_Background_Filename {}
-			, Pips_Shield_Background_SHP {}
+			, Pips_Shield_Background { }
 			, Pips_Shield_Building { { -1,-1,-1 } }
-			, Pips_Shield_Building_Empty {}
+			, Pips_Shield_Building_Empty { }
 		{ }
 
 		virtual ~ExtData() = default;

src/New/Entity/ShieldClass.cpp

@@ -728,9 +728,7 @@ void ShieldClass::DrawShieldBar_Other(int iLength, Point2D* pLocation, Rectangle
 	YOffset = this->Techno->GetTechnoType()->PixelSelectionBracketDelta + this->Type->BracketDelta;
 	vLoc.Y -= 5;
 
-	auto pipBoard = this->Type->Pips_Background_SHP ? this->Type->Pips_Background_SHP :
-		RulesExt::Global()->Pips_Shield_Background_SHP ? RulesExt::Global()->Pips_Shield_Background_SHP :
-		FileSystem::PIPBRD_SHP;
+	auto pipBoard = this->Type->Pips_Background.Get(RulesExt::Global()->Pips_Shield_Background.Get(FileSystem::PIPBRD_SHP()));
 
 	if (iLength == 8)
 	{

src/New/Type/ShieldTypeClass.cpp

@@ -57,17 +57,9 @@ void ShieldTypeClass::LoadFromINI(CCINIClass* pINI)
 	this->AllowTransfer.Read(exINI, pSection, "AllowTransfer");
 
 	this->Pips.Read(exINI, pSection, "Pips");
-	this->Pips_Background_Filename.Read(pINI, pSection, "Pips.Background");
+	this->Pips_Background.Read(exINI, pSection, "Pips.Background");
 	this->Pips_Building.Read(exINI, pSection, "Pips.Building");
 	this->Pips_Building_Empty.Read(exINI, pSection, "Pips.Building.Empty");
-
-	if (this->Pips_Background_Filename)
-	{
-		char filename[0x20];
-		strcpy(filename, this->Pips_Background_Filename);
-		_strlwr_s(filename);
-		this->Pips_Background_SHP = FileSystem::LoadSHPFile(filename);
-	}
 }
 
 template <typename T>
@@ -94,8 +86,7 @@ void ShieldTypeClass::Serialize(T& Stm)
 		.Process(this->PassPercent)
 		.Process(this->AllowTransfer)
 		.Process(this->Pips)
-		.Process(this->Pips_Background_Filename)
-		.Process(this->Pips_Background_SHP)
+		.Process(this->Pips_Background)
 		.Process(this->Pips_Building)
 		.Process(this->Pips_Building_Empty)
 		;

src/New/Type/ShieldTypeClass.h

@@ -33,8 +33,7 @@ class ShieldTypeClass final : public Enumerable<ShieldTypeClass>
 	Nullable<bool> AllowTransfer;
 
 	Valueable<Vector3D<int>> Pips;
-	PhobosFixedString<32u> Pips_Background_Filename;
-	SHPStruct* Pips_Background_SHP;
+	Nullable<SHPStruct*> Pips_Background;
 	Valueable<Vector3D<int>> Pips_Building;
 	Nullable<int> Pips_Building_Empty;
 
@@ -66,12 +65,11 @@ class ShieldTypeClass final : public Enumerable<ShieldTypeClass>
 		, Respawn_Rate__InMinutes(0.0)
 		, SelfHealing_Rate__InMinutes(0.0)
 		, AllowTransfer()
-		, Pips {{ - 1,-1,-1 }}
-		, Pips_Background_Filename {}
-		, Pips_Background_SHP {}
-		, Pips_Building {{ -1,-1,-1 }}
-		, Pips_Building_Empty {}
-	{};
+		, Pips { { -1,-1,-1 } }
+		, Pips_Background { }
+		, Pips_Building { { -1,-1,-1 } }
+		, Pips_Building_Empty { }
+	{ };
 
 	virtual ~ShieldTypeClass() override = default;