diff options
| author | Eugene Sandulenko | 2018-07-21 12:14:52 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-21 12:15:05 +0200 |
| commit | e6b61c3874bcef2057eebfb63ffb021ac466f6b1 (patch) | |
| tree | df78dac12f16ca84826cf7fb04f7c313dc057db6 /engines/illusions | |
| parent | 99f458dafa10e96c671159b74f9cefa9b795ee34 (diff) | |
| download | scummvm-rg350-e6b61c3874bcef2057eebfb63ffb021ac466f6b1.tar.gz scummvm-rg350-e6b61c3874bcef2057eebfb63ffb021ac466f6b1.tar.bz2 scummvm-rg350-e6b61c3874bcef2057eebfb63ffb021ac466f6b1.zip | |
ILLUSIONS: Fix warnings
Diffstat (limited to 'engines/illusions')
| -rw-r--r-- | engines/illusions/duckman/menusystem_duckman.cpp | 4 | ||||
| -rw-r--r-- | engines/illusions/illusions.cpp | 2 | ||||
| -rw-r--r-- | engines/illusions/menusystem.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/illusions/duckman/menusystem_duckman.cpp b/engines/illusions/duckman/menusystem_duckman.cpp index 367eb28312..a36a22d8e7 100644 --- a/engines/illusions/duckman/menusystem_duckman.cpp +++ b/engines/illusions/duckman/menusystem_duckman.cpp @@ -361,7 +361,7 @@ int MenuActionUpdateSlider::calcNewSliderValue(int newOffset) { int start = 0; int end = 0; int currentPosition = 0; - for (int i = 0; i < text.size(); i++) { + for (uint i = 0; i < text.size(); i++) { switch (text[i]) { case '{' : start = i; break; case '}' : end = i; break; @@ -386,7 +386,7 @@ int MenuActionUpdateSlider::calcNewSliderValue(int newOffset) { void MenuActionUpdateSlider::setSliderValue(uint8 newValue) { int start = 0; Common::String text = _menuItem->getText(); - for (int i = 0; i < text.size(); i++) { + for (uint i = 0; i < text.size(); i++) { switch (text[i]) { case '{' : start = i; break; case '|' : text.setChar('~', i); break; diff --git a/engines/illusions/illusions.cpp b/engines/illusions/illusions.cpp index 912c4f6975..20ae8ea17a 100644 --- a/engines/illusions/illusions.cpp +++ b/engines/illusions/illusions.cpp @@ -64,7 +64,7 @@ namespace Illusions { char *debugW2I(byte *wstr) { static char buf[65]; char *p = buf; - int i = 0; + uint i = 0; while (*wstr != 0 && i < sizeof(buf) - 1) { *p++ = *wstr; wstr += 2; diff --git a/engines/illusions/menusystem.cpp b/engines/illusions/menusystem.cpp index 149070d7a7..f61adb42bd 100644 --- a/engines/illusions/menusystem.cpp +++ b/engines/illusions/menusystem.cpp @@ -586,8 +586,8 @@ bool BaseMenuSystem::calcMenuItemTextPositionAtPoint(Common::Point pt, int &offs Common::String text = menuItem->getText(); FontResource *font = _vm->_dict->findFont(_activeMenu->_fontId); - uint curX = 0; - for (int i = 0; i < text.size(); i++) { + int curX = 0; + for (uint i = 0; i < text.size(); i++) { int16 w = font->getCharInfo(text[i])->_width; if (x >= curX && x <= curX + w) { offset = i; |