[Scummvm-cvs-logs] CVS: scummvm scumm.h,1.200,1.201 scummvm.cpp,1.201,1.202

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv742

Modified Files:
	scumm.h scummvm.cpp 
Log Message:
removed the SoundMixer[1] trick; while it was neat it didn't help to simplify the code, and this helps for my 'Engine' superclass

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- scumm.h	14 Aug 2002 00:01:39 -0000	1.200
+++ scumm.h	14 Aug 2002 09:53:34 -0000	1.201
@@ -692,7 +692,7 @@
 	void drawVerb(int verb, int mode);
 	void runInputScript(int a, int cmd, int mode);
 	void restoreVerbBG(int verb);
-	void drawVerbBitmap(int vrb, int x, int y);
+	void drawVerbBitmap(int verb, int x, int y);
 	int getVerbEntrypoint(int obj, int entry);
 	int getVerbSlot(int id, int mode);
 	void killVerb(int slot);
@@ -700,11 +700,7 @@
 	void setVerbObject(uint room, uint object, uint verb);
 
 	/* Should be in Sound class */
-	union {
-		SoundMixer _mixer[1];
-		uint32 xxxx_1;
-	};
-	//SoundMixer _mixer[1];
+	SoundMixer *_mixer;
 
 //	MixerChannel _mixer_channel[NUM_MIXER];
 	byte _sfxMode;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- scummvm.cpp	14 Aug 2002 00:01:39 -0000	1.201
+++ scummvm.cpp	14 Aug 2002 09:53:34 -0000	1.202
@@ -22,6 +22,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
+#include "sound/mixer.h"
 #include "sound/mididrv.h"
 #include "sound/imuse.h"
 #include "actor.h"
@@ -64,6 +65,7 @@
 
 
 Scumm::Scumm (void) {
+	_mixer = new SoundMixer();
 	_newgui = new NewGui(this);
 	_bundle = new Bundle(this);
 	_timer = new Timer(this);
@@ -71,6 +73,7 @@
 
 Scumm::~Scumm (void) {
 	delete [] _actors;
+	delete _mixer;
 	delete _newgui;
 	delete _bundle;
 	delete _timer;