diff options
| author | Torbjörn Andersson | 2010-08-18 17:51:44 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2010-08-18 17:51:44 +0000 |
| commit | 7f97d568298b51370fef3d25b847268416849694 (patch) | |
| tree | 186ea5b65363c1f6260a9b66159e6e7b6241ada6 /engines | |
| parent | 70cd6cfda52ed4feca562aa1b52d3a6c52a4ccba (diff) | |
| download | scummvm-rg350-7f97d568298b51370fef3d25b847268416849694.tar.gz scummvm-rg350-7f97d568298b51370fef3d25b847268416849694.tar.bz2 scummvm-rg350-7f97d568298b51370fef3d25b847268416849694.zip | |
HUGO: Fix GCC warnings.
svn-id: r52192
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/hugo/file.cpp | 6 | ||||
| -rw-r--r-- | engines/hugo/parser.cpp | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/engines/hugo/file.cpp b/engines/hugo/file.cpp index f4838e7320..e343d2d3c8 100644 --- a/engines/hugo/file.cpp +++ b/engines/hugo/file.cpp @@ -745,13 +745,14 @@ void FileManager::printBootText() { debugC(1, kDebugFile, "printBootText"); - if (!ofp.open(BOOTFILE)) + if (!ofp.open(BOOTFILE)) { if (_vm._gameVariant == 3) { //TODO initialize properly _boot structure warning("printBootText - Skipping as H1 Dos may be a freeware"); return; } else Utils::Error(FILE_ERR, BOOTFILE); + } // Allocate space for the text and print it buf = (char *)malloc(_boot.exit_len + 1); @@ -785,13 +786,14 @@ void FileManager::readBootFile() { debugC(1, kDebugFile, "readBootFile"); - if (!ofp.open(BOOTFILE)) + if (!ofp.open(BOOTFILE)) { if (_vm._gameVariant == 3) { //TODO initialize properly _boot structure warning("readBootFile - Skipping as H1 Dos may be a freeware"); return; } else Utils::Error(FILE_ERR, BOOTFILE); + } if (ofp.size() < (int32)sizeof(_boot)) Utils::Error(FILE_ERR, BOOTFILE); diff --git a/engines/hugo/parser.cpp b/engines/hugo/parser.cpp index 24ee1bf3c8..79b616adde 100644 --- a/engines/hugo/parser.cpp +++ b/engines/hugo/parser.cpp @@ -678,9 +678,9 @@ bool Parser::isObjectVerb(object_t *obj, char *line, char *comment) { void Parser::showDosInventory() { // Show user all objects being carried in a variable width 2 column format -static char *intro = "You are carrying:"; -static char *outro = "\nPress ESCAPE to continue"; -static char *blanks = " "; +static const char *intro = "You are carrying:"; +static const char *outro = "\nPress ESCAPE to continue"; +static const char *blanks = " "; uint16 index, len, len1 = 0, len2 = 0; char buffer[XBYTES * NUM_ROWS] = "\0"; @@ -701,12 +701,14 @@ char buffer[XBYTES * NUM_ROWS] = "\0"; strncat (buffer, blanks, (len1 + len2 - strlen(intro)) / 2); strcat (strcat (buffer, intro), "\n"); index = 0; - for (int i = 0; i < _vm._numObj; i++) /* Assign strings */ - if (_vm._objects[i].carriedFl) + for (int i = 0; i < _vm._numObj; i++) { /* Assign strings */ + if (_vm._objects[i].carriedFl) { if (index++ & 1) strcat (strcat (buffer, _vm._arrayNouns[_vm._objects[i].nounIndex][1]), "\n"); else strncat (strcat (buffer, _vm._arrayNouns[_vm._objects[i].nounIndex][1]), blanks, len1 - strlen(_vm._arrayNouns[_vm._objects[i].nounIndex][1])); + } + } if (index & 1) strcat (buffer, "\n"); strcat (buffer, outro); |