From 3c86aa288b532ddf9370fdcf33f144b43ffab5cc Mon Sep 17 00:00:00 2001
From: uruk
Date: Sat, 24 May 2014 10:47:07 +0200
Subject: CGE2: Implement snSound().

Rework the whole Fx class during the process.
The intro animation is working now.
---
 engines/cge2/sound.h | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'engines/cge2/sound.h')

diff --git a/engines/cge2/sound.h b/engines/cge2/sound.h
index c488c3fbba..6fa2b2a553 100644
--- a/engines/cge2/sound.h
+++ b/engines/cge2/sound.h
@@ -72,7 +72,7 @@ public:
 	~Sound();
 	void open();
 	void close();
-	void play(DataCk *wav, int pan);
+	void play(DataCk *wav, int pan = 8);
 	int16 getRepeat();
 	void setRepeat(int16 count);
 	void stop();
@@ -88,23 +88,18 @@ private:
 
 class Fx {
 	CGE2Engine *_vm;
-	struct Handler {
-		int _ref;
-		DataCk *_wav;
-	} *_cache;
 	int _size;
 
-	DataCk *load(int idx, int ref);
 	DataCk *loadWave(EncryptedStream *file);
-	int find(int ref);
+	Common::String name(int ref, int sub);
 public:
 	DataCk *_current;
 
 	Fx(CGE2Engine *vm, int size);
 	~Fx();
 	void clear();
-	void name(int ref, int sub);
-	DataCk *operator[](int ref);
+	bool exist(int ref, int sub = 0);
+	DataCk *load(int ref, int sub = 0);
 };
 
 class MusicPlayer: public Audio::MidiPlayer {
-- 
cgit v1.2.3