SUPERNOVA: Wraps resources in ScopedPtr

1 files changed, 5 insertions, 9 deletions

diff --git a/engines/supernova/resman.h b/engines/supernova/resman.h
index 12304abf5e..080ecc5da4 100644
--- a/engines/supernova/resman.h
+++ b/engines/supernova/resman.h
@@ -23,13 +23,12 @@
 #ifndef SUPERNOVA_RESOURCES_H
 #define SUPERNOVA_RESOURCES_H
 
+#include "audio/audiostream.h"
 #include "common/ptr.h"
 
+#include "supernova/graphics.h"
 #include "supernova/sound.h"
 
-namespace Audio {
-class SeekableAudioStream;
-}
 
 namespace Common {
 class MemoryReadStream;
@@ -37,8 +36,6 @@ class MemoryReadStream;
 
 namespace Supernova {
 
-class MSNImage;
-
 class ResourceManager {
 public:
 	enum CursorId {
@@ -51,11 +48,10 @@ public:
 
 public:
 	ResourceManager();
-	~ResourceManager();
 
 	Audio::SeekableAudioStream *getSoundStream(AudioId index);
 	Audio::AudioStream *getSoundStream(MusicId index);
-	MSNImage *getImage(int filenumber) const;
+	const MSNImage *getImage(int filenumber) const;
 	const byte *getImage(CursorId id) const;
 
 private:
@@ -65,13 +61,13 @@ private:
 	void initImages();
 
 private:
-	Audio::SeekableAudioStream *_soundSamples[kAudioNumSamples];
+	Common::ScopedPtr<Audio::SeekableAudioStream> _soundSamples[kAudioNumSamples];
 	Common::ScopedPtr<Common::MemoryReadStream> _musicIntroBuffer;
 	Common::ScopedPtr<Common::MemoryReadStream> _musicOutroBuffer;
 	Common::ScopedPtr<Audio::AudioStream> _musicIntro;
 	Common::ScopedPtr<Audio::AudioStream> _musicOutro;
 	int _audioRate;
-	MSNImage *_images[kNumImageFiles];
+	MSNImage _images[kNumImageFiles];
 	byte _cursorNormal[256];
 	byte _cursorWait[256];
 };