[Scummvm-git-logs] scummvm master -> c13564369983e8b04b899646394c01fe65e361cb

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c135643699 TITANIC: Fix compiler warnings


Commit: c13564369983e8b04b899646394c01fe65e361cb
    https://github.com/scummvm/scummvm/commit/c13564369983e8b04b899646394c01fe65e361cb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-29T20:03:00-04:00

Commit Message:
TITANIC: Fix compiler warnings

Changed paths:
    engines/titanic/game/speech_dispensor.cpp
    engines/titanic/support/font.cpp



diff --git a/engines/titanic/game/speech_dispensor.cpp b/engines/titanic/game/speech_dispensor.cpp
index 029e421..20ff3c6 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 6501bdc..e519237 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 = '$';