diff options
| author | Paul Gilbert | 2017-05-30 22:23:31 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-05-30 22:23:31 -0400 |
| commit | b21e829a9fab7818159539b83cd20f81a6b16465 (patch) | |
| tree | acaef1897ef8e355679f40ee71b72c3a94d760ca /engines/titanic/pet_control | |
| parent | f698d04008c5342f98d58607d6c3259d42965a5f (diff) | |
| download | scummvm-rg350-b21e829a9fab7818159539b83cd20f81a6b16465.tar.gz scummvm-rg350-b21e829a9fab7818159539b83cd20f81a6b16465.tar.bz2 scummvm-rg350-b21e829a9fab7818159539b83cd20f81a6b16465.zip | |
TITANIC: Renamings and fixes for starfield marker buttons in PET
Diffstat (limited to 'engines/titanic/pet_control')
| -rw-r--r-- | engines/titanic/pet_control/pet_control.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_control.h | 2 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_starfield.cpp | 16 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_starfield.h | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp index 0388859cb2..402ed22719 100644 --- a/engines/titanic/pet_control/pet_control.cpp +++ b/engines/titanic/pet_control/pet_control.cpp @@ -706,8 +706,8 @@ PassengerClass CPetControl::getMailDestClass(const CRoomFlags &roomFlags) const return roomFlags.getSuccUBusClass(roomFlags.getSuccUBusRoomName()); } -void CPetControl::starsSetButtons(int val1, int val2) { - _starfield.setButtons(val1, val2); +void CPetControl::starsSetButtons(int matchIndex, bool isMarkerClose) { + _starfield.setButtons(matchIndex, isMarkerClose); if (_currentArea == PET_STARFIELD) _starfield.makePetDirty(); } diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index 18a6d400f6..6e64d8d344 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -585,7 +585,7 @@ public: /** * Sets the status buttons for the starfield control */ - void starsSetButtons(int val1, int val2); + void starsSetButtons(int matchIndex, bool isMarkerClose); /** * Sets that the user has the galactic reference material diff --git a/engines/titanic/pet_control/pet_starfield.cpp b/engines/titanic/pet_control/pet_starfield.cpp index dd953b592d..874fb5064f 100644 --- a/engines/titanic/pet_control/pet_starfield.cpp +++ b/engines/titanic/pet_control/pet_starfield.cpp @@ -187,24 +187,24 @@ void CPetStarfield::drawButton(int offset, int index, CScreenManager *screenMana _leds[index + offset].draw(screenManager); } -void CPetStarfield::setButtons(int val1, int val2) { +void CPetStarfield::setButtons(int matchIndex, bool isMarkerClose) { _btnOffsets[0] = 0; _btnOffsets[1] = 0; _btnOffsets[2] = 0; - if (val1 >= 0) + if (matchIndex >= 0) _btnOffsets[0] = 2; - if (val1 >= 1) + if (matchIndex >= 1) _btnOffsets[1] = 2; - if (val1 >= 2) + if (matchIndex >= 2) _btnOffsets[2] = 2; - if (val2) { - if (val1 == -1) + if (isMarkerClose) { + if (matchIndex == -1) _btnOffsets[0] = 1; - if (val1 == 0) + if (matchIndex == 0) _btnOffsets[1] = 1; - if (val1 == 1) + if (matchIndex == 1) _btnOffsets[2] = 1; } diff --git a/engines/titanic/pet_control/pet_starfield.h b/engines/titanic/pet_control/pet_starfield.h index ec96fb93ef..01dddfd564 100644 --- a/engines/titanic/pet_control/pet_starfield.h +++ b/engines/titanic/pet_control/pet_starfield.h @@ -105,9 +105,9 @@ public: virtual void save(SimpleFile *file, int indent); /** - * Sets the offsets for each of the buttons + * Sets the display for the marker buttons */ - void setButtons(int val1, int val2); + void setButtons(int matchIndex, bool isMarkerClose); /** * Sets whether the player has the galactic reference material |