diff options
author | Thanasis Antoniou | 2019-09-05 13:13:21 +0300 |
---|---|---|
committer | Thanasis Antoniou | 2019-09-05 13:17:53 +0300 |
commit | ac912a5023c83c4ac87a6e77c213f99d501cdd6b (patch) | |
tree | 96dd1b4ca982bfdee6551401b8b3c3ba247d58ae /engines/bladerunner/ui | |
parent | 541689eeb2f4ffd70ae7989e8313b2928de3ef11 (diff) | |
download | scummvm-rg350-ac912a5023c83c4ac87a6e77c213f99d501cdd6b.tar.gz scummvm-rg350-ac912a5023c83c4ac87a6e77c213f99d501cdd6b.tar.bz2 scummvm-rg350-ac912a5023c83c4ac87a6e77c213f99d501cdd6b.zip |
BLADERUNNER: Revert previous changes in clues listing
Keep the important bug fix which was in KIASectionSuspects::populateAcquiredClues
Some of the changes in the previous commit were due to confusing the role of the getClueIdByIndex method
Diffstat (limited to 'engines/bladerunner/ui')
-rw-r--r-- | engines/bladerunner/ui/kia_section_clues.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/ui/kia_section_crimes.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/ui/kia_section_suspects.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/bladerunner/ui/kia_section_clues.cpp b/engines/bladerunner/ui/kia_section_clues.cpp index 9b9f6b7c00..ce14b9450d 100644 --- a/engines/bladerunner/ui/kia_section_clues.cpp +++ b/engines/bladerunner/ui/kia_section_clues.cpp @@ -283,7 +283,7 @@ void KIASectionClues::populateFilters() { }; for (int i = 0; i < kClueCount; ++i) { - int clueId = _clues->getClueIdByIndex(i); + int clueId = i; if (_clues->isAcquired(clueId)) { int assetType = _vm->_crimesDatabase->getAssetType(clueId); int crimeId = _vm->_crimesDatabase->getCrime(clueId); @@ -383,7 +383,7 @@ void KIASectionClues::populateFilters() { void KIASectionClues::populateClues() { _cluesScrollBox->clearLines(); for (int i = 0; i < kClueCount; ++i) { - int clueId = _clues->getClueIdByIndex(i); + int clueId = i; if (_clues->isAcquired(clueId)) { int assetType = _vm->_crimesDatabase->getAssetType(clueId); int crimeId = _vm->_crimesDatabase->getCrime(clueId); diff --git a/engines/bladerunner/ui/kia_section_crimes.cpp b/engines/bladerunner/ui/kia_section_crimes.cpp index 9061fff78b..8729002cf8 100644 --- a/engines/bladerunner/ui/kia_section_crimes.cpp +++ b/engines/bladerunner/ui/kia_section_crimes.cpp @@ -287,7 +287,7 @@ void KIASectionCrimes::onButtonPressed(int buttonId) { void KIASectionCrimes::populateAcquiredClues() { _acquiredClueCount = 0; for (int i = 0; i < kClueCount; ++i) { - int clueId = _clues->getClueIdByIndex(i); + int clueId = i; if (_clues->isAcquired(clueId)) { _acquiredClues[_acquiredClueCount].clueId = clueId; _acquiredClues[_acquiredClueCount].actorId = _clues->getFromActorId(clueId); @@ -377,7 +377,7 @@ void KIASectionCrimes::populateVisibleClues() { _cluesScrollBox->clearLines(); if (_crimeSelected != -1) { for (uint i = 0; i < kClueCount; ++i) { - int clueId = _clues->getClueIdByIndex(i); + int clueId = i; if (_vm->_crimesDatabase->getAssetType(clueId) != -1 && _vm->_crimesDatabase->getCrime(clueId) == _crimeSelected && _clues->isAcquired(clueId) diff --git a/engines/bladerunner/ui/kia_section_suspects.cpp b/engines/bladerunner/ui/kia_section_suspects.cpp index ba1f6a5f7f..c98c2c77bf 100644 --- a/engines/bladerunner/ui/kia_section_suspects.cpp +++ b/engines/bladerunner/ui/kia_section_suspects.cpp @@ -380,7 +380,7 @@ void KIASectionSuspects::onButtonPressed(int buttonId) { void KIASectionSuspects::populateAcquiredClues() { _acquiredClueCount = 0; for (int i = 0; i < kClueCount; ++i) { - int clueId = _clues->getClueIdByIndex(i); + int clueId = i; if (_clues->isAcquired(clueId)) { _acquiredClues[_acquiredClueCount].clueId = clueId; _acquiredClues[_acquiredClueCount].actorId = _clues->getFromActorId(clueId); |