diff options
| author | Paweł Kołodziejski | 2002-12-26 02:13:19 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-12-26 02:13:19 +0000 |
| commit | 2046fc8217515a2caffd2f6a27521be72a345f01 (patch) | |
| tree | 64fe64a5b39a863a29c9a47ae7492e1c4c493b39 | |
| parent | f89903a24492f2a79114cb6454c3f2049e272ff1 (diff) | |
| download | scummvm-rg350-2046fc8217515a2caffd2f6a27521be72a345f01.tar.gz scummvm-rg350-2046fc8217515a2caffd2f6a27521be72a345f01.tar.bz2 scummvm-rg350-2046fc8217515a2caffd2f6a27521be72a345f01.zip | |
fixed compilation under VC6
svn-id: r6165
| -rw-r--r-- | scumm/scummvm.cpp | 2 | ||||
| -rw-r--r-- | scumm/string.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 4eb975589e..a5dbe7f053 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1205,7 +1205,7 @@ int Scumm::getKeyInput(int a) if (_leftBtnPressed & msClicked && _rightBtnPressed & msClicked) { _mouseButStat = 0; - _lastKeyHit = _vars[VAR_CUTSCENEEXIT_KEY]; + _lastKeyHit = (uint)_vars[VAR_CUTSCENEEXIT_KEY]; } else if (_leftBtnPressed & msClicked) { _mouseButStat = MBS_LEFT_CLICK; } else if (_rightBtnPressed & msClicked) { diff --git a/scumm/string.cpp b/scumm/string.cpp index c7ea18e67e..7e0d14343c 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -104,7 +104,7 @@ void Scumm::CHARSET_1() s = (a->scaley * (int)_vars[VAR_V5_TALK_STRING_Y]) / 0xFF; _string[0].ypos = ((_vars[VAR_V5_TALK_STRING_Y] - s) >> 1) + s - a->elevation + a->y; } else { - _string[0].ypos = _vars[VAR_V5_TALK_STRING_Y]; + _string[0].ypos = (int)_vars[VAR_V5_TALK_STRING_Y]; } if (_string[0].ypos < 1) _string[0].ypos = 1; @@ -254,7 +254,7 @@ void Scumm::CHARSET_1() _charset->_nextLeft = _charset->_left; _charset->_nextTop = _charset->_top; - _talkDelay += _vars[VAR_CHARINC]; + _talkDelay += (int)_vars[VAR_CHARINC]; continue; } |