aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2002-08-14 09:53:34 +0000
committerMax Horn2002-08-14 09:53:34 +0000
commit2125df5f6d7ff229be4cd1ba3c9a8db673e3475c (patch)
treeb1ce1a94ba6ace3d2746e2ef269839cf6cd08878
parent68a9cfeb5ebc8ee6264c857eb59ff7e648399461 (diff)
downloadscummvm-rg350-2125df5f6d7ff229be4cd1ba3c9a8db673e3475c.tar.gz
scummvm-rg350-2125df5f6d7ff229be4cd1ba3c9a8db673e3475c.tar.bz2
scummvm-rg350-2125df5f6d7ff229be4cd1ba3c9a8db673e3475c.zip
removed the SoundMixer[1] trick; while it was neat it didn't help to simplify the code, and this helps for my 'Engine' superclass
svn-id: r4741
-rw-r--r--scumm.h8
-rw-r--r--scummvm.cpp3
2 files changed, 5 insertions, 6 deletions
diff --git a/scumm.h b/scumm.h
index 0caa4dd051..3955ac3f58 100644
--- a/scumm.h
+++ b/scumm.h
@@ -692,7 +692,7 @@ public:
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 @@ public:
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;
diff --git a/scummvm.cpp b/scummvm.cpp
index e35bda2b2e..908139311c 100644
--- a/scummvm.cpp
+++ b/scummvm.cpp
@@ -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 @@ uint Scumm::getRandomNumberRng(uint min, uint max)
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) {
Scumm::~Scumm (void) {
delete [] _actors;
+ delete _mixer;
delete _newgui;
delete _bundle;
delete _timer;