diff options
| author | Colin Snover | 2017-11-16 10:31:59 -0600 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-11-18 22:35:12 +0100 |
| commit | 715d4bd76ab749b88f888ea8196ce252de6140ad (patch) | |
| tree | e781ceb72a4061dbd2cc4c96cd921c1aaf60737e /engines/fullpipe/floaters.h | |
| parent | 6a13592633a6a4cf935409edd1c5504ef7dfa75e (diff) | |
| download | scummvm-rg350-715d4bd76ab749b88f888ea8196ce252de6140ad.tar.gz scummvm-rg350-715d4bd76ab749b88f888ea8196ce252de6140ad.tar.bz2 scummvm-rg350-715d4bd76ab749b88f888ea8196ce252de6140ad.zip | |
FULLPIPE: Fix memory leaks, ownership issues with various point lists
Diffstat (limited to 'engines/fullpipe/floaters.h')
| -rw-r--r-- | engines/fullpipe/floaters.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/fullpipe/floaters.h b/engines/fullpipe/floaters.h index bd7b7ffd2c..161a34282c 100644 --- a/engines/fullpipe/floaters.h +++ b/engines/fullpipe/floaters.h @@ -23,6 +23,9 @@ #ifndef FULLPIPE_FLOATERS_H #define FULLPIPE_FLOATERS_H +#include "common/array.h" +#include "common/ptr.h" + namespace Fullpipe { class StaticANIObject; @@ -52,18 +55,16 @@ struct FloaterArray2 { int val15; int fflags; - FloaterArray2() : ani(0), val2(0), val3(0), val4(0), val5(0), val6(0), val7(0), val8(0), + FloaterArray2() : ani(nullptr), val2(0), val3(0), val4(0), val5(0), val6(0), val7(0), val8(0), val9(0.0), val11(0.0), val13(0), countdown(0), val15(0), fflags(0) {} }; class Floaters { public: - ReactPolygonal *_hRgn; - Common::Array<FloaterArray1 *> _array1; - Common::Array<FloaterArray2 *> _array2; + Common::ScopedPtr<ReactPolygonal> _hRgn; + Common::Array<FloaterArray1> _array1; + Common::Array<FloaterArray2> _array2; - Floaters() { _hRgn = 0; } - ~Floaters(); void init(GameVar *var); void genFlies(Scene *sc, int x, int y, int priority, int flags); void update(); |