From c13564369983e8b04b899646394c01fe65e361cb Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 29 Aug 2016 20:03:00 -0400
Subject: TITANIC: Fix compiler warnings

---
 engines/titanic/game/speech_dispensor.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines/titanic/game')

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:
-- 
cgit v1.2.3