[Scummvm-cvs-logs] CVS: scummvm/queen talk.cpp,1.78,1.79
Gregory Montoir
cyx at users.sourceforge.net
Sat Jan 10 12:34:01 CET 2004
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv3834/queen
Modified Files:
talk.cpp
Log Message:
removed old hack to prevent speaking sentence 0
Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- talk.cpp 10 Jan 2004 19:59:11 -0000 1.78
+++ talk.cpp 10 Jan 2004 20:33:05 -0000 1.79
@@ -1230,9 +1230,7 @@
}
int Talk::splitOption(const char *str, char optionText[5][MAX_STRING_SIZE]) {
-
// Check to see if option fits on one line, and exit early
-
if (_vm->resource()->getLanguage() == ENGLISH ||
_vm->display()->textWidth(str) <= MAX_TEXT_WIDTH) {
strcpy(optionText[0], str);
@@ -1419,7 +1417,7 @@
// Changed zone, change text colors
int y;
- debug(0, "Changed zone. oldZone = %i, zone = %i",
+ debug(6, "Changed zone. oldZone = %i, zone = %i",
oldZone, zone);
if (zone > 0) {
@@ -1453,25 +1451,11 @@
}
else if (mouseButton) {
selectedSentence = zone;
- break;
}
} // while()
}
}
-
-
- // XXX Begin debug stuff
- // debug(6, "----- Select a sentence of these -----");
- for (i = 1; i <= 4; i++) {
- if (_talkString[i][0] != '\0') {
- // XXX debug(6, "%i: %s", i, _talkString[i]);
- if (!selectedSentence)
- selectedSentence = i;
- }
- }
- // XXX End debug stuff
-
debug(6, "Selected sentence %i", selectedSentence);
More information about the Scummvm-git-logs
mailing list