diff options
| author | Colin Snover | 2017-11-14 20:48:26 -0600 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-11-18 22:35:12 +0100 |
| commit | 073692fd5250ae6fb2224f791821c5bd225ba5f0 (patch) | |
| tree | 69f215b63897daf182dc01b60d6c3a15bdfef4ae /engines/fullpipe/scene.h | |
| parent | 0e28f2be4776f2b581ce47865468bad20b84e547 (diff) | |
| download | scummvm-rg350-073692fd5250ae6fb2224f791821c5bd225ba5f0.tar.gz scummvm-rg350-073692fd5250ae6fb2224f791821c5bd225ba5f0.tar.bz2 scummvm-rg350-073692fd5250ae6fb2224f791821c5bd225ba5f0.zip | |
FULLPIPE: Reduce chance of Scene leaks, remove unused SceneTag member
Diffstat (limited to 'engines/fullpipe/scene.h')
| -rw-r--r-- | engines/fullpipe/scene.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/fullpipe/scene.h b/engines/fullpipe/scene.h index dd559a3cf2..cc4cf17d64 100644 --- a/engines/fullpipe/scene.h +++ b/engines/fullpipe/scene.h @@ -65,6 +65,7 @@ class Scene : public Background { MessageQueue *getMessageQueueByName(const Common::String &name); void deleteStaticANIObject(StaticANIObject *obj); + /** takes ownership of the passed obj */ void addStaticANIObject(StaticANIObject *obj, bool addList2); void setPictureObjectsFlag4(); @@ -94,14 +95,14 @@ class Scene : public Background { class SceneTag : public CObject { public: - CObject *_field_4; Common::String _tag; + /** owned, but cannot use ScopedPtr because this object must be copyable */ Scene *_scene; int16 _sceneId; public: SceneTag(); - ~SceneTag(); + virtual ~SceneTag(); virtual bool load(MfcArchive &file); void loadScene(); |