[cleanup] Split eUnitDataSymbolType with big symbols

Author: Jarod42

src/lib/resources/uidata.cpp

@@ -39,7 +39,9 @@ SDL_Rect cGraphicsData::getSmallSymbolPosition (eUnitDataSymbolType symbolType)
 	switch (symbolType)
 	{
 		case eUnitDataSymbolType::Speed: return getRect_SmallSymbol_Speed();
-		case eUnitDataSymbolType::Hits: return getRect_SmallSymbol_Hits();
+		case eUnitDataSymbolType::HitsGreen: return getRect_SmallSymbol_HitsGreen();
+		case eUnitDataSymbolType::HitsOrange: return getRect_SmallSymbol_HitsOrange();
+		case eUnitDataSymbolType::HitsRed: return getRect_SmallSymbol_HitsRed();
 		case eUnitDataSymbolType::Ammo: return getRect_SmallSymbol_Ammo();
 		case eUnitDataSymbolType::Shots: return getRect_SmallSymbol_Shots();
 		case eUnitDataSymbolType::Metal: return getRect_SmallSymbol_Metal();
@@ -49,13 +51,6 @@ SDL_Rect cGraphicsData::getSmallSymbolPosition (eUnitDataSymbolType symbolType)
 		case eUnitDataSymbolType::Human: return getRect_SmallSymbol_Human();
 		case eUnitDataSymbolType::TransportTank: return getRect_SmallSymbol_TransportTank();
 		case eUnitDataSymbolType::TransportAir: return getRect_SmallSymbol_TransportAir();
-
-		case eUnitDataSymbolType::Attack:
-		case eUnitDataSymbolType::Range:
-		case eUnitDataSymbolType::Armor:
-		case eUnitDataSymbolType::Scan:
-		case eUnitDataSymbolType::MetalEmpty:
-			break;
 	}
 	return {};
 }

src/lib/resources/uidata.h

@@ -187,7 +187,9 @@ class cGraphicsData
 	static SDL_Rect getSmallSymbolPosition (eUnitDataSymbolType);
 
 	static SDL_Rect getRect_SmallSymbol_Speed() { return {0, 98, 7, 7}; }
-	static SDL_Rect getRect_SmallSymbol_Hits() { return {14, 98, 6, 9}; }
+	static SDL_Rect getRect_SmallSymbol_HitsGreen() { return {14, 98, 6, 9}; }
+	static SDL_Rect getRect_SmallSymbol_HitsOrange() { return {26, 98, 6, 9}; }
+	static SDL_Rect getRect_SmallSymbol_HitsRed() { return {38, 98, 6, 9}; }
 	static SDL_Rect getRect_SmallSymbol_Ammo() { return {50, 98, 5, 7}; }
 	static SDL_Rect getRect_SmallSymbol_Shots() { return {88, 98, 8, 4}; }
 	static SDL_Rect getRect_SmallSymbol_Metal() { return {60, 98, 7, 10}; }

src/lib/resources/unitdatasymboltype.h

@@ -21,6 +21,23 @@
 #define resources_unitdatasymboltypeH
 
 enum class eUnitDataSymbolType
+{
+	Speed,
+	HitsGreen,
+	HitsOrange,
+	HitsRed,
+	Ammo,
+	Shots,
+	Metal,
+	Oil,
+	Gold,
+	Energy,
+	Human,
+	TransportTank,
+	TransportAir
+};
+
+enum class eUnitDataBigSymbolType
 {
 	Speed,
 	Hits,
@@ -35,9 +52,7 @@ enum class eUnitDataSymbolType
 	Oil,
 	Gold,
 	Energy,
-	Human,
-	TransportTank,
-	TransportAir
+	Human
 };
 
 #endif

src/ui/graphical/game/widgets/unitdetailshud.cpp

@@ -60,6 +60,7 @@ namespace
 			case eStorageUnitsImageType::None: throw std::runtime_error ("unreachable");
 		}
 	}
+
 } // namespace
 
 //------------------------------------------------------------------------------
@@ -136,7 +137,7 @@ void cUnitDetailsHud::reset()
 	const auto& data = unit->data;
 	const auto& staticData = unit->getStaticUnitData();
 
-	drawRow (0, eUnitDataSymbolType::Hits, data.getHitpoints(), data.getHitpointsMax(), lngPack.i18n ("Others~Hitpoints_7"));
+	drawRow (0, getUnitDataSymbolTypeHits(data.getHitpoints(), data.getHitpointsMax()), data.getHitpoints(), data.getHitpointsMax(), lngPack.i18n ("Others~Hitpoints_7"));
 
 	if (data.getSpeedMax() > 0) drawRow (2, eUnitDataSymbolType::Speed, data.getSpeed() / 4, data.getSpeedMax() / 4, lngPack.i18n ("Others~Speed_7"));
 
@@ -251,18 +252,6 @@ void cUnitDetailsHud::drawRow (size_t index, eUnitDataSymbolType symbolType, int
 	auto src = GraphicsData.getSmallSymbolPosition (symbolType);
 	const cPosition srcSize = {src.w, src.h};
 	int toValue = value2;
-
-	if (symbolType == eUnitDataSymbolType::Hits)
-	{
-		if (value1 <= value2 / 4) // red
-		{
-			src.x += srcSize.x() * 4;
-		}
-		else if (value1 <= value2 / 2) // orange
-		{
-			src.x += srcSize.x() * 2;
-		}
-	}
 	int offX = srcSize.x();
 	int step = 1;
 
@@ -295,3 +284,20 @@ void cUnitDetailsHud::drawRow (size_t index, eUnitDataSymbolType symbolType, int
 		value1 -= step;
 	}
 }
+
+//------------------------------------------------------------------------------
+eUnitDataSymbolType cUnitDetailsHud::getUnitDataSymbolTypeHits (int value, int valueMax)
+{
+	if (value <= valueMax / 4) // red
+	{
+		return eUnitDataSymbolType::HitsRed;
+	}
+	else if (value <= valueMax / 2) // orange
+	{
+		return eUnitDataSymbolType::HitsOrange;
+	}
+	else
+	{
+		return eUnitDataSymbolType::HitsGreen;
+	}
+}

src/ui/graphical/game/widgets/unitdetailshud.h

@@ -43,6 +43,7 @@ class cUnitDetailsHud : public cWidget
 
 	// TODO: find nice place for these functions
 	static void drawSmallSymbols (SDL_Surface* destination, int rowHeight, eUnitDataSymbolType, const cPosition&, int value1, int value2);
+	static eUnitDataSymbolType getUnitDataSymbolTypeHits (int value, int valueMax);
 
 private:
 	UniqueSurface surface;

src/ui/graphical/game/widgets/unitdetailsstored.cpp

@@ -94,20 +94,20 @@ void cUnitDetailsStored::reset()
 
 	const auto& data = unit->data;
 
-	drawRow (0, eUnitDataSymbolType::Hits, data.getHitpoints(), data.getHitpointsMax(), lngPack.i18n ("Others~Hitpoints_7"));
+	drawRow (0, cUnitDetailsHud::getUnitDataSymbolTypeHits (data.getHitpoints(), data.getHitpointsMax()), data.getHitpoints(), data.getHitpointsMax(), lngPack.i18n ("Others~Hitpoints_7"));
 
 	if (unit->getStaticUnitData().canAttack) drawRow (1, eUnitDataSymbolType::Ammo, data.getAmmo(), data.getAmmoMax(), lngPack.i18n ("Others~Ammo_7"));
 
 	const cVehicle* vehicle = dynamic_cast<const cVehicle*> (unit);
 	const auto storedResources = vehicle->getStoredResources();
-	const auto storagedResMax = vehicle->getStaticUnitData().storageResMax;
+	const auto storageResMax = vehicle->getStaticUnitData().storageResMax;
 	const auto title = toTranslatedString (unit->getStaticUnitData().storeResType);
 	switch (unit->getStaticUnitData().storeResType)
 	{
 		case eResourceType::None: break;
-		case eResourceType::Metal: drawRow (1, eUnitDataSymbolType::Metal, storedResources, storagedResMax, title); break;
-		case eResourceType::Oil: drawRow (1, eUnitDataSymbolType::Oil, storedResources, storagedResMax, title); break;
-		case eResourceType::Gold: drawRow (1, eUnitDataSymbolType::Gold, storedResources, storagedResMax, title); break;
+		case eResourceType::Metal: drawRow (1, eUnitDataSymbolType::Metal, storedResources, storageResMax, title); break;
+		case eResourceType::Oil: drawRow (1, eUnitDataSymbolType::Oil, storedResources, storageResMax, title); break;
+		case eResourceType::Gold: drawRow (1, eUnitDataSymbolType::Gold, storedResources, storageResMax, title); break;
 	}
 }