diff options
| author | Paul Gilbert | 2014-09-05 22:21:24 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-09-05 22:21:24 -0400 |
| commit | efcf87a6e5d9be34839cb60e3b257fe330a3b103 (patch) | |
| tree | 1301e1cef4e738efed0651c66c8802caa3aef67b /engines/mads/nebular/sound_nebular.h | |
| parent | 2942f93ed5c884fdd3843ff56b6a2688fdb780dc (diff) | |
| download | scummvm-rg350-efcf87a6e5d9be34839cb60e3b257fe330a3b103.tar.gz scummvm-rg350-efcf87a6e5d9be34839cb60e3b257fe330a3b103.tar.bz2 scummvm-rg350-efcf87a6e5d9be34839cb60e3b257fe330a3b103.zip | |
MADS: Fix OPL init error when showing credits multiple times
Diffstat (limited to 'engines/mads/nebular/sound_nebular.h')
| -rw-r--r-- | engines/mads/nebular/sound_nebular.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/engines/mads/nebular/sound_nebular.h b/engines/mads/nebular/sound_nebular.h index 744467b45e..abb6516030 100644 --- a/engines/mads/nebular/sound_nebular.h +++ b/engines/mads/nebular/sound_nebular.h @@ -305,10 +305,12 @@ public: public: /** * Constructor + * @param mixer Mixer + * @param opl OPL * @param filename Specifies the adlib sound player file to use * @param dataOffset Offset in the file of the data segment */ - ASound(Audio::Mixer *mixer, const Common::String &filename, int dataOffset); + ASound(Audio::Mixer *mixer, FM_OPL *opl, const Common::String &filename, int dataOffset); /** * Destructor @@ -408,7 +410,7 @@ private: void command111213(); int command2627293032(); public: - ASound1(Audio::Mixer *mixer); + ASound1(Audio::Mixer *mixer, FM_OPL *opl); virtual int command(int commandId, int param); }; @@ -460,7 +462,7 @@ private: void command9Randomize(); void command9Apply(byte *data, int val, int incr); public: - ASound2(Audio::Mixer *mixer); + ASound2(Audio::Mixer *mixer, FM_OPL *opl); virtual int command(int commandId, int param); }; @@ -520,7 +522,7 @@ private: void command9Randomize(); void command9Apply(byte *data, int val, int incr); public: - ASound3(Audio::Mixer *mixer); + ASound3(Audio::Mixer *mixer, FM_OPL *opl); virtual int command(int commandId, int param); }; @@ -558,7 +560,7 @@ private: void method1(); public: - ASound4(Audio::Mixer *mixer); + ASound4(Audio::Mixer *mixer, FM_OPL *opl); virtual int command(int commandId, int param); }; @@ -604,7 +606,7 @@ private: int command42(); int command43(); public: - ASound5(Audio::Mixer *mixer); + ASound5(Audio::Mixer *mixer, FM_OPL *opl); virtual int command(int commandId, int param); }; @@ -633,7 +635,7 @@ private: int command25(); int command29(); public: - ASound6(Audio::Mixer *mixer); + ASound6(Audio::Mixer *mixer, FM_OPL *opl); virtual int command(int commandId, int param); }; @@ -665,7 +667,7 @@ private: int command36(); int command37(); public: - ASound7(Audio::Mixer *mixer); + ASound7(Audio::Mixer *mixer, FM_OPL *opl); virtual int command(int commandId, int param); }; @@ -708,7 +710,7 @@ private: void method1(byte *pData); void adjustRange(byte *pData, byte v, int incr); public: - ASound8(Audio::Mixer *mixer); + ASound8(Audio::Mixer *mixer, FM_OPL *opl); virtual int command(int commandId, int param); }; @@ -767,7 +769,7 @@ private: int command59(); int command60(); public: - ASound9(Audio::Mixer *mixer); + ASound9(Audio::Mixer *mixer, FM_OPL *opl); virtual int command(int commandId, int param); }; |