diff options
Diffstat (limited to 'engines/m4/console.cpp')
| -rw-r--r-- | engines/m4/console.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/engines/m4/console.cpp b/engines/m4/console.cpp index 71c70e3e1b..88b4240901 100644 --- a/engines/m4/console.cpp +++ b/engines/m4/console.cpp @@ -61,8 +61,10 @@ static int strToInt(const char *s) { return atoi(s); // Hexadecimal string - uint tmp; - sscanf(s, "%xh", &tmp); + uint tmp = 0; + int read = sscanf(s, "%xh", &tmp); + if (read < 1) + error("strToInt failed on string \"%s\"", s); return (int)tmp; } @@ -121,7 +123,7 @@ bool Console::cmdPlaySound(int argc, const char **argv) { bool Console::cmdPlayDSRSound(int argc, const char **argv) { if (argc != 2 && argc != 3) { DebugPrintf("Usage: %s <sound index> <DSR file>\n", argv[0]); - DebugPrintf("The DSR file parameter is optional, and specifies which DSR to load\n", argv[0]); + DebugPrintf("The DSR file parameter is optional, and specifies which DSR to load\n"); } else { if (argc == 3) _vm->_sound->loadDSRFile(argv[2]); @@ -319,17 +321,25 @@ bool MadsConsole::cmdMessage(int argc, const char **argv) { DebugPrintf("message 'objnum'\n"); } else if (!strcmp(argv[1], "list_quotes")) { // Dump the quotes list +#if 0 + // FIXME: The following code is not portable and hence has been disabled. + // Try replacing FILE by Common::DumpFile. FILE *destFile = fopen("mads_quotes.txt", "wb"); for (uint i = 0; i < _vm->globals()->getQuotesSize(); ++i) fprintf(destFile, "%.3d - %s\n", i, _vm->globals()->getQuote(i)); fclose(destFile); +#endif } else if (!strcmp(argv[1], "list_vocab")) { // Dump the vocab list +#if 0 + // FIXME: The following code is not portable and hence has been disabled. + // Try replacing FILE by Common::DumpFile. FILE *destFile = fopen("mads_vocab.txt", "wb"); for (uint i = 1; i <= _vm->globals()->getVocabSize(); ++i) fprintf(destFile, "%.3d/%.3x - %s\n", i, i, _vm->globals()->getVocab(i)); fclose(destFile); +#endif } else { int messageIdx = strToInt(argv[1]); |