Add mStructureIcons field to FactoryListBox

OutpostUniverse · Feb 16, 2025 · 227a75c · 227a75c
1 parent f451143
commit 227a75c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/appOPHD/UI/FactoryListBox.cpp b/appOPHD/UI/FactoryListBox.cpp
@@ -19,13 +19,7 @@
 using namespace NAS2D;
 
 
-namespace
-{
-	const Image* STRUCTURE_ICONS = nullptr;
-}
-
-
-static void drawItem(Renderer& renderer, const NAS2D::Font& font, const NAS2D::Font& fontBold, FactoryListBox::FactoryListBoxItem& item, NAS2D::Rectangle<int> rect, bool highlight)
+static void drawItem(Renderer& renderer, const NAS2D::Font& font, const NAS2D::Font& fontBold, const NAS2D::Image& structureIcons, FactoryListBox::FactoryListBoxItem& item, NAS2D::Rectangle<int> rect, bool highlight)
 {
 	Factory* f = item.factory;
 
@@ -40,7 +34,7 @@ static void drawItem(Renderer& renderer, const NAS2D::Font& font, const NAS2D::F
 	renderer.drawBox(rect.inset(2), structureColor);
 
 	const auto subImageRect = NAS2D::Rectangle{item.icon_slice, {46, 46}};
-	renderer.drawSubImage(*STRUCTURE_ICONS, rect.position + NAS2D::Vector{8, 8}, subImageRect, NAS2D::Color::White.alphaFade(structureColor.alpha));
+	renderer.drawSubImage(structureIcons, rect.position + NAS2D::Vector{8, 8}, subImageRect, NAS2D::Color::White.alphaFade(structureColor.alpha));
 	renderer.drawText(fontBold, f->name(), rect.position + NAS2D::Vector{64, 29 - fontBold.height() / 2}, structureTextColor);
 	if (productType != ProductType::PRODUCT_NONE)
 	{
@@ -59,10 +53,10 @@ FactoryListBox::FactoryListBox() :
 	ListBoxBase{
 		fontCache.load(constants::FONT_PRIMARY, 12),
 		fontCache.load(constants::FONT_PRIMARY_BOLD, 12)
-	}
+	},
+	mStructureIcons{imageCache.load("ui/structures.png")}
 {
 	itemHeight(58);
-	STRUCTURE_ICONS = &imageCache.load("ui/structures.png");
 }
 
 
@@ -135,6 +129,7 @@ void FactoryListBox::update()
 			renderer,
 			mFont,
 			mFontBold,
+			mStructureIcons,
 			*static_cast<FactoryListBoxItem*>(mItems[i]),
 			{
 				{positionX(),

diff --git a/appOPHD/UI/FactoryListBox.h b/appOPHD/UI/FactoryListBox.h
@@ -39,4 +39,7 @@ class FactoryListBox : public ListBoxBase
 	Factory* selectedFactory();
 
 	void update() override;
+
+private:
+	const NAS2D::Image& mStructureIcons;
 };