libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LASTEXPRESS: Use Common::Rational when adjusting menu clock

Browse Source 
Also fix the wrong check that set the time directly to the target time

svn-id: r53885
This commit is contained in:
Julien Templier 2010-10-27 19:22:05 +00:00
parent 44ba44297d
commit 5a336830a0
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/lastexpress/game/menu.cpp
View File

@ -45,6 +45,8 @@
#include "lastexpress/lastexpress.h"
#include "lastexpress/resource.h"
#include "common/rational.h"
#define getNextGameId() (GameId)((_gameId + 1) % 6)
namespace LastExpress {
@ -1442,17 +1444,19 @@ void Menu::adjustTime() {
uint32 originalTime = _time;
// Adjust time delta
uint32 timeDelta = (_delta >= 90) ? 9 : (9 * _delta + 89) / 90;
Common::Rational timeDelta(_delta >= 90 ? 9 : (9 * _delta + 89), _delta >= 90 ? 1 : 90);
if (_currentTime < _time) {
_time -= 900 * timeDelta;
timeDelta *= 900;
_time -= timeDelta.toInt();
if (_time >= _currentTime)
if (_currentTime > _time)
_time = _currentTime;
} else {
_time += 900 * timeDelta;
timeDelta *= 900;
_time += timeDelta.toInt();
if (_time < _currentTime)
if (_currentTime < _time)
_time = _currentTime;
}