[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.92,2.93

Max Horn fingolfin at users.sourceforge.net
Wed May 21 04:23:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv18056

Modified Files:
	script_v2.cpp 
Log Message:
fix warnings

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.92
retrieving revision 2.93
diff -u -d -r2.92 -r2.93
--- script_v2.cpp	21 May 2003 10:13:05 -0000	2.92
+++ script_v2.cpp	21 May 2003 11:22:03 -0000	2.93
@@ -883,14 +883,16 @@
 
 	strcpy(sentence, (char*)getResourceAddress(rtVerb, slot));
 	if (_scummVars[VAR_SENTENCE_OBJECT1] > 0) {
-		if (temp = getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT1])) {
+		temp = getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT1]);
+		if (temp) {
 			strcat(sentence, " ");
 			strcat(sentence, (char*)temp);
 		}
 	}
 
 	if (_scummVars[VAR_SENTENCE_OBJECT2] > 0) {
-		if (temp = getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT2])) {
+		temp = getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT2]);
+		if (temp) {
 			strcat(sentence, " with ");
 			strcat(sentence, (char*)temp);
 		}





More information about the Scummvm-git-logs mailing list