diff options
author | Torbjörn Andersson | 2006-05-24 19:51:37 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2006-05-24 19:51:37 +0000 |
commit | 4a583216fbfd7eee2197bac249c3f62007c2d4e4 (patch) | |
tree | 1f4d29458dd829d0d8f11b386040ec1a18b12a1a /engines/agi/id.cpp | |
parent | 8d954b7ae50c0391ba49ceeb26294a21bbe5b77f (diff) | |
download | scummvm-rg350-4a583216fbfd7eee2197bac249c3f62007c2d4e4.tar.gz scummvm-rg350-4a583216fbfd7eee2197bac249c3f62007c2d4e4.tar.bz2 scummvm-rg350-4a583216fbfd7eee2197bac249c3f62007c2d4e4.zip |
Fixed most - not all - GCC warnings.
svn-id: r22614
Diffstat (limited to 'engines/agi/id.cpp')
-rw-r--r-- | engines/agi/id.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/agi/id.cpp b/engines/agi/id.cpp index 70a1a9e098..4320864a75 100644 --- a/engines/agi/id.cpp +++ b/engines/agi/id.cpp @@ -310,13 +310,12 @@ int v2id_game() { uint32 len, c, crc; uint8 *buff; Common::File fp; - char *fn[] = { "viewdir", "logdir", "picdir", "snddir", "words.tok", "object", "" }; + const char *fn[] = { "viewdir", "logdir", "picdir", "snddir", "words.tok", "object", "" }; buff = (uint8 *)malloc(8192); for (crc = y = 0; fn[y][0]; y++) { - char *path = fn[y]; - if (fp.open(path)) { + if (fp.open(fn[y])) { for (len = 1; len > 0;) { memset(buff, 0, 8192); len = fp.read(buff, 8000); @@ -350,14 +349,13 @@ int v3id_game() { uint32 len, c, crc; uint8 *buff; Common::File fp; - char *fn[] = { "words.tok", "object", "" }; + const char *fn[] = { "words.tok", "object", "" }; Common::String path; buff = (uint8 *)malloc(8192); for (crc = 0, y = 0; fn[y][0] != 0x0; y++) { - path = fn[y]; - if (fp.open(path)) { + if (fp.open(fn[y])) { len = 1; while (len > 0) { memset(buff, 0, 8192); |