[Scummvm-cvs-logs] CVS: scummvm/queen talk.cpp,1.54,1.55

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv1181

Modified Files:
	talk.cpp 
Log Message:
make Joe say something when trying to speak to a mute object/person

Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- talk.cpp	5 Dec 2003 13:56:06 -0000	1.54
+++ talk.cpp	6 Dec 2003 13:12:52 -0000	1.55
@@ -105,19 +105,12 @@
 
 	if (data->entryObj > 0)
 		return;
-	
-	// XXX R=ROOM_DATA[ROOM];
-	// XXX if(OBJECT_DATA[NOUN2+R][0]<=0) return;
-	// XXX if(OBJECT_DATA[NOUN2+R][4]>0) return;
-	// XXX strcpy(Pstr,FIND_STATE(OBJECT_DATA[NOUN2+R][6],"TALK"));
 
-	// I cant talk to that.
-
-	// XXX if(seq(Pstr,"MUTE")) {
-	// XXX 	k=24+Rnd(2);
-	// XXX 	SPEAK(JOE_RESPstr[k],"JOE",find_cd_desc(k));
-	// XXX 	return;
-	// XXX }
+	if (State::findTalk(data->state) == STATE_TALK_MUTE) {
+		// 'I can't talk to that'
+		_logic->joeSpeak(24 + Logic::randomizer.getRandomNumber(2));
+		return;
+	}
 
 	load(filename);