[Scummvm-git-logs] scummvm master -> 1d731cb6c0225bd1707521e95d48a19a68be2d64

[bgK]

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

Summary:
bfeb2d48e2 MOHAWK: MYST: Increment y_pos of observatory day slider faster
1d731cb6c0 Merge pull request #1220 from dafioram/mystDaySlider


Commit: bfeb2d48e2468134766500eef88d95a71aa12e71
    https://github.com/scummvm/scummvm/commit/bfeb2d48e2468134766500eef88d95a71aa12e71
Author: David Fioramonti (dafioram at gmail.com)
Date: 2018-06-19T05:23:59-07:00

Commit Message:
MOHAWK: MYST: Increment y_pos of observatory day slider faster

Fixes Trac#10572.

The day slider does not go all the way to the bottom (day 31st)
when the down arrow is used to increment the day. This change
increases how much y displacement happens with each change
in the day so that the bottom is reach on day 31st.

This is just a graphical bug and doesn't affect the logic
of the puzzle. The day slider can also be dragged to the bottom
without using the buttons.

Changed paths:
    engines/mohawk/myst_stacks/myst.cpp


diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index 5a64b8f..481a624 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -1701,7 +1701,11 @@ void Myst::observatoryIncrementDay(int16 increment) {
 		_vm->getCard()->redrawArea(74);
 
 		// Update slider
-		_observatoryDaySlider->setPosition(91 + 3 * _state.observatoryDaySetting);
+		// WORKAROUND: Have the day setting increment at 315/100 rather than x3 so that the slider
+		// will reach the bottom spot on day 31st. Only relevant when using the down button and
+		// not dragging the slider. Fixes Trac#10572. The original engine incremented it with x3 
+		// and has this bug, but it is less noticeable.
+		_observatoryDaySlider->setPosition(91 + (_state.observatoryDaySetting * 315) / 100 );
 		_observatoryDaySlider->restoreBackground();
 		_observatoryDaySlider->drawConditionalDataToScreen(2);
 		_state.observatoryDaySlider = _observatoryDaySlider->_pos.y;


Commit: 1d731cb6c0225bd1707521e95d48a19a68be2d64
    https://github.com/scummvm/scummvm/commit/1d731cb6c0225bd1707521e95d48a19a68be2d64
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-06-24T17:17:54+02:00

Commit Message:
Merge pull request #1220 from dafioram/mystDaySlider

MOHAWK: MYST: Increment y_pos of observatory day slider faster

Changed paths:
    engines/mohawk/myst_stacks/myst.cpp