CGE: Remove Startup class, set _fx and _sound as dynamic

1 files changed, 5 insertions, 6 deletions

diff --git a/engines/cge/sound.h b/engines/cge/sound.h
index 3ca4deaecc..292cb30e76 100644
--- a/engines/cge/sound.h
+++ b/engines/cge/sound.h
@@ -30,18 +30,21 @@
 
 #include "cge/wav.h"
 #include "cge/snddrv.h"
+#include "cge/cge.h"
 
 namespace CGE {
 
 class Sound {
 public:
 	SmpInfo _smpinf;
-	Sound();
+	Sound(CGEEngine *vm);
 	~Sound();
 	void open();
 	void close();
 	void play(DataCk *wav, int pan, int cnt = 1);
 	void stop();
+private:
+	CGEEngine *_vm;
 };
 
 
@@ -55,17 +58,13 @@ class Fx {
 	int find(int ref);
 public:
 	DataCk *_current;
-	Fx(int size = 16);
+	Fx(int size);
 	~Fx();
 	void clear();
 	void preload(int ref0);
 	DataCk *operator[](int ref);
 };
 
-extern  Sound  _sound;
-extern  Fx     _fx;
-
-
 void loadMidi(int ref);
 void killMidi();