Add missing BUG combat help (#69)

VDuchauffour · Oct 18, 2024 · 3b83c52 · 3b83c52
1 parent db2a0c2
commit 3b83c52
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/Assets/CvGameCoreDLL.dll b/Assets/CvGameCoreDLL.dll
diff --git a/Assets/XML/GlobalDefinesVersion.xml b/Assets/XML/GlobalDefinesVersion.xml
@@ -2,6 +2,6 @@
 <Civ4Defines xmlns="x-schema:CIV4GlobalDefinesSchema.xml">
 	<Define>
 		<DefineName>RFCE_MOD_VERSION</DefineName>
-		<DefineTextVal>1.6.5-5</DefineTextVal>
+		<DefineTextVal>1.6.5-6</DefineTextVal>
 	</Define>
 </Civ4Defines>
diff --git a/CvGameCoreDLL/CvGameTextMgr.cpp b/CvGameCoreDLL/CvGameTextMgr.cpp
@@ -548,6 +548,19 @@ void CvGameTextMgr::setUnitHelp(CvWStringBuffer &szString, const CvUnit *pUnit,
   bool bShift = gDLL->shiftKey();
   bool bAlt = gDLL->altKey();
 
+  //KNOEDELstart
+  //FlavourMod: Added by Jean Elcard (display unit combat symbol in unit tool tip) - integrated into BUG by Tholal
+  if (getBugOptionBOOL("MainInterface__UnitCombatIcons", true, "BUG_UNIT_COMBAT_ICONS"))
+  {
+    if (pUnit->getUnitCombatType() != NO_UNITCOMBAT)
+    {
+      szTempBuffer.Format(L"<img=%S size=16></img> ", GC.getUnitCombatInfo(pUnit->getUnitCombatType()).getButton());
+      szString.append(szTempBuffer);
+    }
+  }
+  //FlavourMod: End
+  //KNOEDELend
+
   szTempBuffer.Format(SETCOLR L"%s" ENDCOLR, TEXT_COLOR("COLOR_UNIT_TEXT"), pUnit->getName().GetCString());
   szString.append(szTempBuffer);