[Scummvm-cvs-logs] SF.net SVN: scummvm: [29479] scummvm/trunk/engines

[fingolfin at users.sourceforge.net]

Revision: 29479
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29479&view=rev
Author:   fingolfin
Date:     2007-11-11 12:17:13 -0800 (Sun, 11 Nov 2007)

Log Message:
-----------
Silencing some warnings

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/cruise_main.cpp
    scummvm/trunk/engines/lure/hotspots.cpp

Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp	2007-11-11 19:33:25 UTC (rev 29478)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp	2007-11-11 20:17:13 UTC (rev 29479)
@@ -861,7 +861,6 @@
 
 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 @@
 					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);
 

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2007-11-11 19:33:25 UTC (rev 29478)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2007-11-11 20:17:13 UTC (rev 29479)
@@ -884,11 +884,12 @@
 	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 @@
 			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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.