diff options
| author | Paul Gilbert | 2011-07-05 20:40:24 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2011-07-05 20:40:24 +1000 |
| commit | a1f177317c780f1223f153ccc3934eae2a76111b (patch) | |
| tree | e0fb1e4b0d57fdcde96bb93b173f71fe917523c0 /engines/cge | |
| parent | fe0ff3b2e98b8a0ec68f497925aefbdea77aeed0 (diff) | |
| download | scummvm-rg350-a1f177317c780f1223f153ccc3934eae2a76111b.tar.gz scummvm-rg350-a1f177317c780f1223f153ccc3934eae2a76111b.tar.bz2 scummvm-rg350-a1f177317c780f1223f153ccc3934eae2a76111b.zip | |
CGE: Bugfix for ProgName method
Diffstat (limited to 'engines/cge')
| -rw-r--r-- | engines/cge/general.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/engines/cge/general.cpp b/engines/cge/general.cpp index 50dfeaeb5a..c4552e6f23 100644 --- a/engines/cge/general.cpp +++ b/engines/cge/general.cpp @@ -99,12 +99,12 @@ void _fqsort(void *base, uint16 nelem, uint16 width, int (*fcmp)(const void *, c } const char *progName(const char *ext) { - warning("progName"); - - static Common::String buf = "CGE"; + static char buf[MAXFILE]; + strcpy(buf, "CGE"); if (ext) - buf += ext; - return buf.c_str(); + strcat(buf, ext); + + return buf; } char *mergeExt(char *buf, const char *nam, const char *ext) { @@ -238,10 +238,6 @@ uint16 IoHand::read(void *buf, uint16 len) { error("Read %s - %d bytes", _file->getName(), len); if (_crypt) _seed = _crypt(buf, len, Seed); - - if (_file->eos()) - _error = 1; - return bytesRead; } |