diff options
| author | Paul Gilbert | 2018-12-08 20:35:54 -0800 |
|---|---|---|
| committer | Paul Gilbert | 2018-12-08 20:35:54 -0800 |
| commit | b9a99a897d6e669c43b9faa39300db5a5efac118 (patch) | |
| tree | 1b9911ce7cfde4710a73e9aa8b893fcf83c6234a /engines/glk/screen.cpp | |
| parent | 867adc6dcac3969863f933435bf98012e52c90aa (diff) | |
| download | scummvm-rg350-b9a99a897d6e669c43b9faa39300db5a5efac118.tar.gz scummvm-rg350-b9a99a897d6e669c43b9faa39300db5a5efac118.tar.bz2 scummvm-rg350-b9a99a897d6e669c43b9faa39300db5a5efac118.zip | |
GLK: Further fixes for Buildbot warnings
Diffstat (limited to 'engines/glk/screen.cpp')
| -rw-r--r-- | engines/glk/screen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/glk/screen.cpp b/engines/glk/screen.cpp index 6768360df1..2276998b8f 100644 --- a/engines/glk/screen.cpp +++ b/engines/glk/screen.cpp @@ -48,8 +48,8 @@ void Screen::initialize() { double baseLine = (double)r1.bottom; double leading = (double)r2.bottom + 2; - g_conf->_leading = MAX((double)g_conf->_leading, leading); - g_conf->_baseLine = MAX((double)g_conf->_baseLine, baseLine); + g_conf->_leading = static_cast<int>(MAX((double)g_conf->_leading, leading)); + g_conf->_baseLine = static_cast<int>(MAX((double)g_conf->_baseLine, baseLine)); g_conf->_cellW = _fonts[0]->getStringWidth("0"); g_conf->_cellH = g_conf->_leading; } @@ -157,7 +157,7 @@ const Graphics::Font *Screen::loadFont(FACES face, Common::Archive *archive, dou if (!f.open(FILENAMES[face], *archive)) error("Could not load font"); - return Graphics::loadTTFFont(f, size, Graphics::kTTFSizeModeCharacter); + return Graphics::loadTTFFont(f, (int)size, Graphics::kTTFSizeModeCharacter); } FACES Screen::getFontId(const Common::String &name) { |