diff options
author | Colin Snover | 2017-11-12 10:15:59 -0600 |
---|---|---|
committer | Eugene Sandulenko | 2017-11-18 22:35:12 +0100 |
commit | 8f1d76d2616489924f472815f91107cd46d479de (patch) | |
tree | 0abf9e177d09ccbc84e7cb320cde6ec2efaf00ad /engines/fullpipe/ngiarchive.h | |
parent | 92f5718e2b5a28a6c6a0b9a221079e7fd2d42438 (diff) | |
download | scummvm-rg350-8f1d76d2616489924f472815f91107cd46d479de.tar.gz scummvm-rg350-8f1d76d2616489924f472815f91107cd46d479de.tar.bz2 scummvm-rg350-8f1d76d2616489924f472815f91107cd46d479de.zip |
FULLPIPE: Improve memory safety and typing of NGIArchive
Diffstat (limited to 'engines/fullpipe/ngiarchive.h')
-rw-r--r-- | engines/fullpipe/ngiarchive.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/fullpipe/ngiarchive.h b/engines/fullpipe/ngiarchive.h index a5b05a2e50..18646faf00 100644 --- a/engines/fullpipe/ngiarchive.h +++ b/engines/fullpipe/ngiarchive.h @@ -23,6 +23,7 @@ #ifndef FULLPIPE_NGIARCHIVE_H #define FULLPIPE_NGIARCHIVE_H +#include "common/ptr.h" #include "common/str.h" namespace Fullpipe { @@ -39,7 +40,7 @@ struct NgiHeader { char filename[NGI_FILENAME_MAX]; }; -typedef Common::HashMap<Common::String, NgiHeader*, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> NgiHeadersMap; +typedef Common::HashMap<Common::String, Common::ScopedPtr<NgiHeader>, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> NgiHeadersMap; class NGIArchive : public Common::Archive { NgiHeadersMap _headers; @@ -62,7 +63,7 @@ public: * * May return 0 in case of a failure. */ -Common::Archive *makeNGIArchive(const Common::String &name); +NGIArchive *makeNGIArchive(const Common::String &name); } // End of namespace Fullpipe |