diff options
| author | Eugene Sandulenko | 2017-03-23 07:17:00 +0000 |
|---|---|---|
| committer | GitHub | 2017-03-23 07:17:00 +0000 |
| commit | db4979fb1c75f80396d666b2217eca9b85a2d353 (patch) | |
| tree | 3e3f47ccbcc27eb2bd72b26ca94f84b46e997652 /engines/fullpipe/utils.h | |
| parent | 530aa6c9a04e2b14fda0538fc094028dec6a6d6e (diff) | |
| parent | 3e515890e86e924f7fa270acec0de6462a2bc0d1 (diff) | |
| download | scummvm-rg350-db4979fb1c75f80396d666b2217eca9b85a2d353.tar.gz scummvm-rg350-db4979fb1c75f80396d666b2217eca9b85a2d353.tar.bz2 scummvm-rg350-db4979fb1c75f80396d666b2217eca9b85a2d353.zip | |
Merge pull request #925 from bluegr/fullpipe_common_str
Fullpipe Common::String + memory leak fixes
Diffstat (limited to 'engines/fullpipe/utils.h')
| -rw-r--r-- | engines/fullpipe/utils.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/fullpipe/utils.h b/engines/fullpipe/utils.h index 2f9b75c07f..06b2872b54 100644 --- a/engines/fullpipe/utils.h +++ b/engines/fullpipe/utils.h @@ -67,8 +67,8 @@ public: MfcArchive(Common::SeekableReadStream *file); MfcArchive(Common::WriteStream *file); - char *readPascalString(bool twoByte = false); - void writePascalString(const char *str, bool twoByte = false); + Common::String readPascalString(bool twoByte = false); + void writePascalString(Common::String str, bool twoByte = false); int readCount(); double readDouble(); CObject *parseClass(bool *isCopyReturned); @@ -117,7 +117,7 @@ public: virtual void save(MfcArchive &out) { error("Not implemented for obj type: %d", _objtype); } virtual ~CObject() {} - bool loadFile(const char *fname); + bool loadFile(Common::String fname); }; class ObList : public Common::List<CObject *>, public CObject { @@ -130,7 +130,7 @@ class MemoryObject : CObject { friend class Scene; protected: - char *_memfilename; + Common::String _memfilename; int _mfield_8; int _mfield_C; int _mfield_10; @@ -145,7 +145,7 @@ class MemoryObject : CObject { virtual ~MemoryObject(); virtual bool load(MfcArchive &file); - void loadFile(char *filename); + void loadFile(Common::String filename); void load() { loadFile(_memfilename); } byte *getData(); byte *loadData(); @@ -180,8 +180,8 @@ class DWordArray : public Common::Array<int32>, public CObject { virtual bool load(MfcArchive &file); }; -char *genFileName(int superId, int sceneId, const char *ext); -byte *transCyrillic(byte *s); +Common::String genFileName(int superId, int sceneId, const char *ext); +byte *transCyrillic(Common::String str); } // End of namespace Fullpipe |