diff options
| author | johndoe123 | 2014-03-15 21:57:51 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
| commit | 9385238a59dc5e1790a21a8f9eaf761fc93a660e (patch) | |
| tree | 879bc7a15e354d2a15e0a041bca7c0f825286f02 /engines/illusions/time.cpp | |
| parent | 9a63f0bd17b5c8fab468a61c09cdc29cedf287a5 (diff) | |
| download | scummvm-rg350-9385238a59dc5e1790a21a8f9eaf761fc93a660e.tar.gz scummvm-rg350-9385238a59dc5e1790a21a8f9eaf761fc93a660e.tar.bz2 scummvm-rg350-9385238a59dc5e1790a21a8f9eaf761fc93a660e.zip | |
ILLUSIONS: More work on actor related code
- Add isTimerExpired function
Diffstat (limited to 'engines/illusions/time.cpp')
| -rw-r--r-- | engines/illusions/time.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/illusions/time.cpp b/engines/illusions/time.cpp index 7873db6ba4..f190035b10 100644 --- a/engines/illusions/time.cpp +++ b/engines/illusions/time.cpp @@ -26,8 +26,14 @@ namespace Illusions { uint32 getCurrentTime() { - // TODO, move to own file with other time related code - return g_system->getMillis(); + return g_system->getMillis() / 60; +} + +bool isTimerExpired(uint32 startTime, uint32 endTime) { + uint32 currTime = getCurrentTime(); + return !( + (startTime > endTime && (currTime <= endTime || currTime >= startTime)) || + (startTime < endTime && currTime <= endTime && currTime >= startTime)); } } // End of namespace Illusions |