diff options
| author | Paul Gilbert | 2016-08-29 20:03:00 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-29 20:03:00 -0400 |
| commit | c13564369983e8b04b899646394c01fe65e361cb (patch) | |
| tree | d4705f06b6cc05a7a781a5767575897ab8b0fbd1 | |
| parent | e7f6ccbecec6a20fe2969b962bc73e4aee725249 (diff) | |
| download | scummvm-rg350-c13564369983e8b04b899646394c01fe65e361cb.tar.gz scummvm-rg350-c13564369983e8b04b899646394c01fe65e361cb.tar.bz2 scummvm-rg350-c13564369983e8b04b899646394c01fe65e361cb.zip | |
TITANIC: Fix compiler warnings
| -rw-r--r-- | engines/titanic/game/speech_dispensor.cpp | 5 | ||||
| -rw-r--r-- | engines/titanic/support/font.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/titanic/game/speech_dispensor.cpp b/engines/titanic/game/speech_dispensor.cpp index 029e4219f1..20ff3c69e0 100644 --- a/engines/titanic/game/speech_dispensor.cpp +++ b/engines/titanic/game/speech_dispensor.cpp @@ -62,7 +62,7 @@ void CSpeechDispensor::load(SimpleFile *file) { } bool CSpeechDispensor::FrameMsg(CFrameMsg *msg) { - if (_fieldEC || _seasonNum == 0 || _seasonNum == 3) + if (_fieldEC || _seasonNum == SEASON_SUMMER || _seasonNum == SEASON_SPRING) return true; CGameObject *dragObject = getDraggingObject(); @@ -79,7 +79,8 @@ bool CSpeechDispensor::FrameMsg(CFrameMsg *msg) { if (_dragItem) { Point pt(_itemPos.x + _dragItem->_bounds.left, _itemPos.y + _dragItem->_bounds.top); - bool flag = checkPoint(pt, true); + if (!checkPoint(pt, true)) + return true; switch (_state) { case 0: diff --git a/engines/titanic/support/font.cpp b/engines/titanic/support/font.cpp index 6501bdca54..e519237c3b 100644 --- a/engines/titanic/support/font.cpp +++ b/engines/titanic/support/font.cpp @@ -206,7 +206,7 @@ void STFont::writeString(CVideoSurface *surface, const Point &destPos, Rect &cli } // Iterate through each character of the string - for (const byte *srcP = (byte *)str.c_str(); *srcP; ++srcP) { + for (const byte *srcP = (const byte *)str.c_str(); *srcP; ++srcP) { byte c = *srcP; if (c == 0xE9) c = '$'; |