diff options
| author | Paul Gilbert | 2012-09-30 21:21:09 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2012-09-30 21:21:09 +1000 |
| commit | 84e07ae7253217c4b1ad650abdef57ffaa6b0032 (patch) | |
| tree | e5ca389cd7366cf43b347ab7bfbef4c02df5c282 /engines/hopkins/font.cpp | |
| parent | 8fa33e7714fca1aeb80834ee5d97bcfdf8a3efb1 (diff) | |
| download | scummvm-rg350-84e07ae7253217c4b1ad650abdef57ffaa6b0032.tar.gz scummvm-rg350-84e07ae7253217c4b1ad650abdef57ffaa6b0032.tar.bz2 scummvm-rg350-84e07ae7253217c4b1ad650abdef57ffaa6b0032.zip | |
HOPKINS: Changed all __int16 to int
Diffstat (limited to 'engines/hopkins/font.cpp')
| -rw-r--r-- | engines/hopkins/font.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp index 5618ea9767..c44f0cdca9 100644 --- a/engines/hopkins/font.cpp +++ b/engines/hopkins/font.cpp @@ -51,7 +51,7 @@ void FontManager::clearAll() { } void FontManager::TEXTE_ON(int idx) { - if ((signed __int16)(idx - 5) > 11) + if ((idx - 5) > 11) error("Attempted to display text > MAX_TEXT."); TxtItem &txt = Txt[idx - 5]; @@ -66,7 +66,7 @@ void FontManager::TEXTE_ON(int idx) { void FontManager::TEXTE_OFF(int idx) { - if ((signed __int16)(idx - 5) > 11) + if ((idx - 5) > 11) error("Attempted to display text > MAX_TEXT."); TxtItem &txt = Txt[idx - 5]; @@ -422,7 +422,7 @@ LABEL_57: TRIER_TEXT[v67] = 0; } while (v25 != v67); ++v67; - } while ((signed __int16)v67 <= 19); + } while (v67 <= 19); v68 = 0; do { @@ -431,7 +431,7 @@ LABEL_57: ++v68; } while (v68 <= 19); - if ((unsigned __int16)(Txt[idx].field3FC - 2) > 1u) { + if ((Txt[idx].field3FC - 2) > 1u) { for (i = xp - _vm->_eventsManager.start_x; largeur_boite + i > 638 && i > -2 && Txt[idx].field3FC]; i -= 2) ; Txt[idx].field8 = i; @@ -471,7 +471,7 @@ LABEL_57: } v29 = Txt[idx].field3FC; - if (v29 == 1 || v29 == 3 || (unsigned __int16)(v29 - 5) <= 1u) { + if (v29 == 1 || v29 == 3 || (uint16)(v29 - 5) <= 1u) { v49 = v51 * v53; ptrd = _vm->_globals.dos_malloc2(v51 * v53); @@ -485,9 +485,9 @@ LABEL_57: _vm->_globals.dos_free2(ptrd); _vm->_graphicsManager.Plot_Hline(_vm->_graphicsManager.VESA_BUFFER, v56, v55, v53, -2); - _vm->_graphicsManager.Plot_Hline(_vm->_graphicsManager.VESA_BUFFER, v56, (signed __int16)(v51 + v55), v53, -2); + _vm->_graphicsManager.Plot_Hline(_vm->_graphicsManager.VESA_BUFFER, v56, (v51 + v55), v53, -2); _vm->_graphicsManager.Plot_Vline(_vm->_graphicsManager.VESA_BUFFER, v56, v70, v51, -2); - _vm->_graphicsManager.Plot_Vline(_vm->_graphicsManager.VESA_BUFFER, (signed __int16)(v53 + v56), v70, v51, -2); + _vm->_graphicsManager.Plot_Vline(_vm->_graphicsManager.VESA_BUFFER, (v53 + v56), v70, v51, -2); } Txt[idx].field12 = v58; |