aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph-Eugene Winzer2017-06-21 12:55:20 +0200
committerThierry Crozat2018-01-22 23:34:49 +0000
commitf2e3a4d9c458499108d73f1e616517c8b8e841d6 (patch)
tree08738055923e1515bd7a8823a62fcf1e1dace73d
parent534bd3837069f45c94e07a6ef593550b29abe51e (diff)
downloadscummvm-rg350-f2e3a4d9c458499108d73f1e616517c8b8e841d6.tar.gz
scummvm-rg350-f2e3a4d9c458499108d73f1e616517c8b8e841d6.tar.bz2
scummvm-rg350-f2e3a4d9c458499108d73f1e616517c8b8e841d6.zip
SUPERNOVA: Changes return type to int for getDOSTicks()
The maximum return value is 0x1800B0, so easily covered by int (assuming 32bit+ architecture)
-rw-r--r--engines/supernova/supernova.cpp8
-rw-r--r--engines/supernova/supernova.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp
index 2e2957f0c4..53890398dd 100644
--- a/engines/supernova/supernova.cpp
+++ b/engines/supernova/supernova.cpp
@@ -165,13 +165,13 @@ Common::Error SupernovaEngine::run() {
}
// Emulates DOS int 1A/00
-uint SupernovaEngine::getDOSTicks() {
+int SupernovaEngine::getDOSTicks() {
TimeDate systemTime;
_system->getTimeAndDate(systemTime);
- return static_cast<uint>((systemTime.tm_hour * 24 +
- systemTime.tm_min * 60 +
- systemTime.tm_sec) * 18.2065);
+ return static_cast<int>((systemTime.tm_hour * 24 +
+ systemTime.tm_min * 60 +
+ systemTime.tm_sec) * 18.2065);
}
void SupernovaEngine::updateEvents() {
diff --git a/engines/supernova/supernova.h b/engines/supernova/supernova.h
index c1dc3013a7..0068d70191 100644
--- a/engines/supernova/supernova.h
+++ b/engines/supernova/supernova.h
@@ -95,7 +95,7 @@ public:
int _textCursorY;
int _textColor;
- uint getDOSTicks();
+ int getDOSTicks();
void initData();
void initPalette();
void paletteFadeIn();