[Scummvm-git-logs] scummvm master -> 33fdc6045fd02bbf79c9aefdee5aa7a01c3ba077

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
33fdc6045f BLADERUNNER: Fix alignment issues with hidden clues


Commit: 33fdc6045fd02bbf79c9aefdee5aa7a01c3ba077
    https://github.com/scummvm/scummvm/commit/33fdc6045fd02bbf79c9aefdee5aa7a01c3ba077
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-05-31T01:01:52+03:00

Commit Message:
BLADERUNNER: Fix alignment issues with hidden clues

Original Bug.

Hidden clues would appear left aligned without left padding, after setting them as hidden (right click),
then switching to another KIA tab and back to the clues/suspect/crime tab with the hidden clue.
All other clues appear with padding 6. Now, so do the hidden ones.

Changed paths:
    engines/bladerunner/ui/kia_section_clues.cpp
    engines/bladerunner/ui/kia_section_crimes.cpp
    engines/bladerunner/ui/kia_section_suspects.cpp


diff --git a/engines/bladerunner/ui/kia_section_clues.cpp b/engines/bladerunner/ui/kia_section_clues.cpp
index c24bc7cc7c..81472b8e02 100644
--- a/engines/bladerunner/ui/kia_section_clues.cpp
+++ b/engines/bladerunner/ui/kia_section_clues.cpp
@@ -390,11 +390,20 @@ void KIASectionClues::populateClues() {
 			if (assetType != -1 || _debugIntangible) {
 				if (_filters[getLineIdForAssetType(assetType)] && _filters[getLineIdForCrimeId(crimeId)]) {
 					int flags = 0x30;
+#if BLADERUNNER_ORIGINAL_BUGS
 					if (_clues->isPrivate(clueId)) {
 						flags = 0x08;
 					} else if (_clues->isViewed(clueId)) {
 						flags = 0x10;
 					}
+#else
+					if (_clues->isPrivate(clueId)) {
+						flags |= 0x08;
+					}
+					if (_clues->isViewed(clueId)) {
+						flags &= ~0x20;
+					}
+#endif // BLADERUNNER_ORIGINAL_BUGS
 					_cluesScrollBox->addLine(_vm->_crimesDatabase->getClueText(clueId), clueId, flags);
 				}
 			}
diff --git a/engines/bladerunner/ui/kia_section_crimes.cpp b/engines/bladerunner/ui/kia_section_crimes.cpp
index 34f88e788f..774ca6f404 100644
--- a/engines/bladerunner/ui/kia_section_crimes.cpp
+++ b/engines/bladerunner/ui/kia_section_crimes.cpp
@@ -381,11 +381,20 @@ void KIASectionCrimes::populateVisibleClues() {
 			 && _clues->isAcquired(clueId)
 			) {
 				int flags = 0x30;
+#if BLADERUNNER_ORIGINAL_BUGS
 				if (_clues->isPrivate(clueId)) {
 					flags = 0x08;
 				} else if (_clues->isViewed(clueId)) {
 					flags = 0x10;
 				}
+#else
+				if (_clues->isPrivate(clueId)) {
+					flags |= 0x08;
+				}
+				if (_clues->isViewed(clueId)) {
+					flags &= ~0x20;
+				}
+#endif // BLADERUNNER_ORIGINAL_BUGS
 				_cluesScrollBox->addLine(_vm->_crimesDatabase->getClueText(clueId), clueId, flags);
 			}
 		}
diff --git a/engines/bladerunner/ui/kia_section_suspects.cpp b/engines/bladerunner/ui/kia_section_suspects.cpp
index e41a5840b9..3bf8113e21 100644
--- a/engines/bladerunner/ui/kia_section_suspects.cpp
+++ b/engines/bladerunner/ui/kia_section_suspects.cpp
@@ -443,11 +443,20 @@ void KIASectionSuspects::populateVisibleClues() {
 
 				if (showClue) {
 					int flags = 0x30;
+#if BLADERUNNER_ORIGINAL_BUGS
 					if (_clues->isPrivate(clueId)) {
 						flags = 0x08;
 					} else if (_clues->isViewed(clueId)) {
 						flags = 0x10;
 					}
+#else
+					if (_clues->isPrivate(clueId)) {
+						flags |= 0x08;
+					}
+					if (_clues->isViewed(clueId)) {
+						flags &= ~0x20;
+					}
+#endif // BLADERUNNER_ORIGINAL_BUGS
 					_cluesScrollBox->addLine(_vm->_crimesDatabase->getClueText(clueId), clueId, flags);
 				}
 			}