UI condition "Unique" now returns true if the unit has a character, too

Andrettin · Jan 1, 2016 · 85c1ad1 · 85c1ad1
1 parent 408eba4
commit 85c1ad1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/map/map_draw.cpp b/src/map/map_draw.cpp
@@ -478,10 +478,10 @@ void CViewport::Draw() const
 			PixelPos unit_center_pos = Map.TilePosToMapPixelPos_TopLeft(UnitUnderCursor->tilePos);
 			unit_center_pos = MapToScreenPixelPos(unit_center_pos);
 			std::string text_color;
-			if (UnitUnderCursor->Unique) {
-				text_color = "orange";
+			if (UnitUnderCursor->Unique || UnitUnderCursor->Character != NULL) {
+				text_color = "fire";
 			} else if (UnitUnderCursor->Prefix != NULL || UnitUnderCursor->Suffix != NULL) {
-				text_color = "blue";
+				text_color = "light-blue";
 			}
 			DrawGenericPopup(UnitUnderCursor->GetMessageName(), unit_center_pos.x, unit_center_pos.y, text_color);
 			//Wyrmgus end

diff --git a/src/ui/botpanel.cpp b/src/ui/botpanel.cpp
@@ -475,7 +475,7 @@ static bool CanShowPopupContent(const PopupConditionPanel *condition,
 				}
 			}
 			if (condition->Unique != CONDITION_TRUE) {
-				if ((condition->Unique == CONDITION_ONLY) ^ unit.Unique) {
+				if ((condition->Unique == CONDITION_ONLY) ^ (unit.Unique || unit.Character != NULL)) {
 					return false;
 				}
 			}

diff --git a/src/ui/mainscr.cpp b/src/ui/mainscr.cpp
@@ -286,7 +286,7 @@ static bool CanShowContent(const ConditionPanel *condition, const CUnit &unit)
 		}
 	}
 	if (condition->Unique != CONDITION_TRUE) {
-		if ((condition->Unique == CONDITION_ONLY) ^ unit.Unique) {
+		if ((condition->Unique == CONDITION_ONLY) ^ (unit.Unique || unit.Character != NULL)) {
 			return false;
 		}
 	}