From d2ee52abbae4c7346d1a24c1c1d3c01c452d267c Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 11 Nov 2007 20:17:13 +0000
Subject: Silencing some warnings

svn-id: r29479
---
 engines/cruise/cruise_main.cpp | 3 +--
 engines/lure/hotspots.cpp      | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index e315925aba..fa596f6855 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -861,7 +861,6 @@ menuElementSubStruct *getSelectedEntryInMenu(menuStruct *pMenu) {
 
 bool createDialog(int objOvl, int objIdx, int x, int y) {
 	bool found = false;
-	bool first = true;
 	int testState1 = -1;
 	int testState2 = -1;
 	int j;
@@ -991,7 +990,7 @@ bool findRelation(int objOvl, int objIdx, int x, int y) {
 					thisOvl = j;
 				}
 
-				const char* pName = getObjectName(ptrHead->obj1Number, overlayTable[thisOvl].ovlData->arrayNameObj);
+				//const char* pName = getObjectName(ptrHead->obj1Number, overlayTable[thisOvl].ovlData->arrayNameObj);
 
 				objDataStruct* pObject = getObjectDataFromOverlay(thisOvl, ptrHead->obj1Number);
 
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index 7c085997da..434b084afd 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -884,11 +884,12 @@ void Hotspot::startTalkDialog() {
 	Room &room = Room::getReference();
 
 	if ((_data->talkDestCharacterId != 0) && (_data->talkDestCharacterId != NOONE_ID)) {
-		HotspotData *hotspot = Resources::getReference().getHotspot(_data->talkDestCharacterId);
+//		HotspotData *hotspot = Resources::getReference().getHotspot(_data->talkDestCharacterId);
 //		hotspot->talkerId = _hotspotId;
 	}
 
-	if (room.roomNumber() != roomNumber()) return;
+	if (room.roomNumber() != roomNumber())
+		return;
 	room.setTalkDialog(hotspotId(), _data->talkDestCharacterId, _data->useHotspotId, 
 		_data->talkMessageId);
 }
@@ -3289,7 +3290,7 @@ void HotspotTickHandlers::talkAnimHandler(Hotspot &h) {
 			res.setTalkState(TALK_SELECT);
 
 			// Make sure the dest character holds still while an option is selected
-			HotspotData *destHotspot = res.getHotspot(talkDestCharacter);
+			//HotspotData *destHotspot = res.getHotspot(talkDestCharacter);
 			//destHotspot->talkerId = h.hotspotId();
 		} else {
 			res.setTalkState(TALK_RESPOND);
-- 
cgit v1.2.3