libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-12 20:50:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed the SoundMixer[1] trick; while it was neat it didn't help to simplify the code, and this helps for my 'Engine' superclass

Browse Source 
svn-id: r4741
This commit is contained in:
Max Horn 2002-08-14 09:53:34 +00:00
parent 68a9cfeb5e
commit 2125df5f6d
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scumm.h
View File

@ -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;

3
scummvm.cpp
View File

@ -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;