[Scummvm-cvs-logs] CVS: tools sword1mp3.c,1.2,1.3
Max Horn
fingolfin at users.sourceforge.net
Sat Dec 4 18:17:01 CET 2004
Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13875
Modified Files:
sword1mp3.c
Log Message:
sword1mp3 is the only of our tools which requires the user to press 'return' when an error occurs; this is also rather strange behavior for a CLI program -> removing that
Index: sword1mp3.c
===================================================================
RCS file: /cvsroot/scummvm/tools/sword1mp3.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sword1mp3.c 13 Oct 2004 00:30:22 -0000 1.2
+++ sword1mp3.c 5 Dec 2004 02:16:04 -0000 1.3
@@ -480,8 +480,6 @@
if (!clu) {
printf("Unable to open \"SPEECH%d.CLU\".\n", i);
printf("Please copy the \"SPEECH.CLU\" from CD %d\nand rename it to \"SPEECH%d.CLU\".\n", i, i);
- printf("<Press Enter>\n");
- getchar();
} else {
sprintf(outName, "SPEECH/SPEECH%d.%s", i, (compMode == kMP3Mode) ? ("CL3") : ("CLV"));
@@ -489,8 +487,6 @@
if (!cl3) {
printf("Unable to create file \"%s\".\n", outName);
printf("Please make sure you've got write permission in this directory.\n");
- printf("<Press Enter>\n");
- getchar();
} else {
printf("Converting CD %d...\n", i);
convertClu(clu, cl3, compMode);
@@ -515,7 +511,6 @@
if (!inf) {
if (!musicNames[i].missing) {
printf("unable to open file \"%s\"\n", fNameIn);
- getchar();
}
} else {
fclose(inf);
@@ -565,7 +560,7 @@
printf("Please copy the SPEECH.CLU files from Broken Sword CD1 and CD2\n");
printf("into the \"SPEECH\" subdirectory and rename them to\n");
printf("SPEECH1.CLU and SPEECH2.CLU\n\n");
- printf("If your O/S is case-sensitive, make sure the filenames\n");
+ printf("If your OS is case-sensitive, make sure the filenames\n");
printf("and directorynames are all upper-case.\n\n");
}
}
@@ -582,14 +577,12 @@
printf("Unable to find music files.\n");
printf("Please copy the music files from Broken Sword CD1 and CD2\n");
printf("into the \"MUSIC\" subdirectory.\n");
- printf("If your O/S is case-sensitive, make sure the filenames\n");
+ printf("If your OS is case-sensitive, make sure the filenames\n");
printf("and directorynames are all upper-case.\n");
}
}
if ((checkSpeech && (!speechFound)) || (checkMusic && (!musicFound))) {
- printf("\nUse --help for more information\n\n");
- printf("<PRESS ENTER>\n");
- getchar();
+ printf("\nUse --help for more information\n");
exit(2);
}
}
More information about the Scummvm-git-logs
mailing list