diff options
| author | Max Horn | 2006-04-23 17:39:31 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-23 17:39:31 +0000 |
| commit | 4b6f90945bfc8ad6c51a46747a0c133393b1fa9b (patch) | |
| tree | 3d470ebd52b587f9d3ae731ae00e9ffc209771c0 /engines/scumm/scumm.h | |
| parent | 0d67640a58b044ade0605319e091df9b2f666e4a (diff) | |
| download | scummvm-rg350-4b6f90945bfc8ad6c51a46747a0c133393b1fa9b.tar.gz scummvm-rg350-4b6f90945bfc8ad6c51a46747a0c133393b1fa9b.tar.bz2 scummvm-rg350-4b6f90945bfc8ad6c51a46747a0c133393b1fa9b.zip | |
Modified openFile and openResourceFile to take a Common::String instead of a char pointer
svn-id: r22112
Diffstat (limited to 'engines/scumm/scumm.h')
| -rw-r--r-- | engines/scumm/scumm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index e9813d1333..dbf8154675 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -732,7 +732,7 @@ public: /** The name of the (macintosh/rescumm style) container file, if any. */ Common::String _containerFile; - bool openFile(BaseScummFile &file, const char *filename, bool resourceFile = false); // TODO: Use Common::String + bool openFile(BaseScummFile &file, const Common::String &filename, bool resourceFile = false); protected: int _resourceHeaderSize; @@ -748,7 +748,7 @@ protected: void deleteRoomOffsets(); virtual void readRoomsOffsets(); void askForDisk(const char *filename, int disknum); // TODO: Use Common::String - bool openResourceFile(const char *filename, byte encByte); // TODO: Use Common::String + bool openResourceFile(const Common::String &filename, byte encByte); // TODO: Use Common::String void loadPtrToResource(int type, int i, const byte *ptr); virtual void readResTypeList(int id, const char *name); |