aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/hopkins/dialogs.cpp6
-rw-r--r--engines/hopkins/sound.cpp131
-rw-r--r--engines/hopkins/sound.h4
3 files changed, 90 insertions, 51 deletions
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
index 0cd53bb9b0..19934f01df 100644
--- a/engines/hopkins/dialogs.cpp
+++ b/engines/hopkins/dialogs.cpp
@@ -79,7 +79,6 @@ void DialogsManager::showOptionsDialog() {
if (mousePos.x >= _vm->_graphicsManager.ofscroll + 300 && mousePos.y > 113 && mousePos.x <= _vm->_graphicsManager.ofscroll + 327 && mousePos.y <= 138) {
// Change the music volume
++_vm->_soundManager.MUSICVOL;
- _vm->_soundManager.OLD_MUSICVOL = _vm->_soundManager.MUSICVOL;
if (_vm->_soundManager.MUSICVOL <= 12)
_vm->_soundManager.playSound("bruit2.wav");
@@ -97,7 +96,6 @@ void DialogsManager::showOptionsDialog() {
else
_vm->_soundManager.MUSICVOL = 0;
- _vm->_soundManager.OLD_MUSICVOL = _vm->_soundManager.MUSICVOL;
_vm->_soundManager.MODSetMusicVolume(_vm->_soundManager.MUSICVOL);
_vm->_soundManager.updateScummVMSoundSettings();
@@ -110,7 +108,6 @@ void DialogsManager::showOptionsDialog() {
_vm->_soundManager.playSound("bruit2.wav");
else
_vm->_soundManager.SOUNDVOL = 16;
- _vm->_soundManager.OLD_SOUNDVOL = _vm->_soundManager.SOUNDVOL;
_vm->_soundManager.MODSetSampleVolume();
_vm->_soundManager.updateScummVMSoundSettings();
@@ -122,7 +119,6 @@ void DialogsManager::showOptionsDialog() {
_vm->_soundManager.playSound("bruit2.wav");
else
_vm->_soundManager.SOUNDVOL = 0;
- _vm->_soundManager.OLD_SOUNDVOL = _vm->_soundManager.SOUNDVOL;
_vm->_soundManager.MODSetSampleVolume();
_vm->_soundManager.updateScummVMSoundSettings();
@@ -137,7 +133,6 @@ void DialogsManager::showOptionsDialog() {
_vm->_soundManager.playSound("bruit2.wav");
else
_vm->_soundManager.VOICEVOL = 16;
- _vm->_soundManager.OLD_VOICEVOL = _vm->_soundManager.VOICEVOL;
_vm->_soundManager.MODSetVoiceVolume();
_vm->_soundManager.updateScummVMSoundSettings();
@@ -149,7 +144,6 @@ void DialogsManager::showOptionsDialog() {
_vm->_soundManager.playSound("bruit2.wav");
else
_vm->_soundManager.VOICEVOL = 0;
- _vm->_soundManager.OLD_VOICEVOL = _vm->_soundManager.VOICEVOL;
_vm->_soundManager.MODSetVoiceVolume();
_vm->_soundManager.updateScummVMSoundSettings();
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 66de0356ac..87a588509f 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -28,6 +28,8 @@
#include "hopkins/sound.h"
#include "hopkins/globals.h"
#include "hopkins/hopkins.h"
+#include "audio/audiostream.h"
+#include "audio/mods/protracker.h"
namespace Audio {
@@ -75,9 +77,6 @@ SoundManager::SoundManager() {
SOUNDVOL = 0;
VOICEVOL = 0;
MUSICVOL = 0;
- OLD_SOUNDVOL = 0;
- OLD_MUSICVOL = 0;
- OLD_VOICEVOL = 0;
_soundOffFl = true;
_musicOff = true;
_voiceOffFl = true;
@@ -102,6 +101,7 @@ SoundManager::SoundManager() {
SoundManager::~SoundManager() {
stopMusic();
delMusic();
+ _vm->_mixer->stopHandle(_modHandle);
MOD_FLAG = false;
}
@@ -227,7 +227,10 @@ void SoundManager::WSOUND(int soundNumber) {
switch (soundNumber) {
case 1:
- PLAY_MOD("appar");
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ PLAY_MOD("appart");
+ else
+ PLAY_MOD("appar");
break;
case 2:
PLAY_MOD("ville");
@@ -236,31 +239,52 @@ void SoundManager::WSOUND(int soundNumber) {
PLAY_MOD("Rock");
break;
case 4:
- PLAY_MOD("polic");
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ PLAY_MOD("police");
+ else
+ PLAY_MOD("polic");
break;
case 5:
PLAY_MOD("deep");
break;
case 6:
- PLAY_MOD("purga");
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ PLAY_MOD("purgat");
+ else
+ PLAY_MOD("purga");
break;
case 7:
- PLAY_MOD("rivie");
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ PLAY_MOD("riviere");
+ else
+ PLAY_MOD("rivie");
break;
case 8:
- PLAY_MOD("SUSPE");
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ PLAY_MOD("SUSPENS");
+ else
+ PLAY_MOD("SUSPE");
break;
case 9:
PLAY_MOD("labo");
break;
case 10:
- PLAY_MOD("cadav");
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ PLAY_MOD("cadavre");
+ else
+ PLAY_MOD("cadav");
break;
case 11:
- PLAY_MOD("caban");
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ PLAY_MOD("cabane");
+ else
+ PLAY_MOD("caban");
break;
case 12:
- PLAY_MOD("purg2");
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ PLAY_MOD("purgat2");
+ else
+ PLAY_MOD("purg2");
break;
case 13:
PLAY_MOD("foret");
@@ -272,19 +296,28 @@ void SoundManager::WSOUND(int soundNumber) {
PLAY_MOD("ile2");
break;
case 16:
- PLAY_MOD("hopki");
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ PLAY_MOD("hopkins");
+ else
+ PLAY_MOD("hopki");
break;
case 17:
PLAY_MOD("peur");
break;
case 18:
- PLAY_MOD("peur");
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ PLAY_MOD("URAVOLGA");
+ else
+ PLAY_MOD("peur");
break;
case 19:
PLAY_MOD("BASE");
break;
case 20:
- PLAY_MOD("cada2");
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ PLAY_MOD("cadavre2");
+ else
+ PLAY_MOD("cada2");
break;
case 21:
PLAY_MOD("usine");
@@ -362,37 +395,48 @@ void SoundManager::loadMusic(const Common::String &file) {
delMusic();
Common::File f;
- Common::String filename = Common::String::format("%s.TWA", file.c_str());
-
- if (!f.open(filename))
- error("Error opening file %s", filename.c_str());
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) {
+ Common::String filename = Common::String::format("%s.MOD", file.c_str());
- char s[8];
- int destIndex = 0;
- int mwavIndex;
+ if (!f.open(filename))
+ error("Error opening file %s", filename.c_str());
- bool breakFlag = false;
- do {
- f.read(&s[0], 3);
+ Audio::AudioStream *modStream = Audio::makeProtrackerStream(&f);
+ _vm->_mixer->playStream(Audio::Mixer::kMusicSoundType, &_modHandle, modStream);
- if (s[0] == 'x') {
- // End of list reached
- Music._mwavIndexes[destIndex] = -1;
- breakFlag = true;
- } else {
- // Convert two digits to a number
- s[2] = '\0';
- mwavIndex = atol(&s[0]);
-
- filename = Common::String::format("%s_%s.%s", file.c_str(), &s[0],
- (_vm->getPlatform() == Common::kPlatformWindows) ? "APC" : "WAV");
- LOAD_MSAMPLE(mwavIndex, filename);
-
- assert(destIndex < MUSIC_WAVE_COUNT);
- Music._mwavIndexes[destIndex++] = mwavIndex;
- }
- } while (!breakFlag);
- f.close();
+ } else {
+ Common::String filename = Common::String::format("%s.TWA", file.c_str());
+
+ if (!f.open(filename))
+ error("Error opening file %s", filename.c_str());
+
+ char s[8];
+ int destIndex = 0;
+ int mwavIndex;
+
+ bool breakFlag = false;
+ do {
+ f.read(&s[0], 3);
+
+ if (s[0] == 'x') {
+ // End of list reached
+ Music._mwavIndexes[destIndex] = -1;
+ breakFlag = true;
+ } else {
+ // Convert two digits to a number
+ s[2] = '\0';
+ mwavIndex = atol(&s[0]);
+
+ filename = Common::String::format("%s_%s.%s", file.c_str(), &s[0],
+ (_vm->getPlatform() == Common::kPlatformWindows) ? "APC" : "WAV");
+ LOAD_MSAMPLE(mwavIndex, filename);
+
+ assert(destIndex < MUSIC_WAVE_COUNT);
+ Music._mwavIndexes[destIndex++] = mwavIndex;
+ }
+ } while (!breakFlag);
+ f.close();
+ }
Music._active = true;
Music._isPlaying = false;
@@ -428,6 +472,9 @@ void SoundManager::checkSounds() {
}
void SoundManager::checkMusic() {
+ if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+ return;
+
if (Music._active && Music._isPlaying) {
int mwavIndex = Music._mwavIndexes[Music._currentIndex];
if (mwavIndex == -1)
diff --git a/engines/hopkins/sound.h b/engines/hopkins/sound.h
index c67e9e0987..23fac3f705 100644
--- a/engines/hopkins/sound.h
+++ b/engines/hopkins/sound.h
@@ -112,13 +112,11 @@ private:
*/
Audio::RewindableAudioStream *makeSoundStream(Common::SeekableReadStream *stream);
public:
+ Audio::SoundHandle _modHandle;
int SPECIAL_SOUND;
int SOUNDVOL;
int VOICEVOL;
int MUSICVOL;
- int OLD_SOUNDVOL;
- int OLD_MUSICVOL;
- int OLD_VOICEVOL;
bool _soundOffFl;
bool _musicOff;
bool _voiceOffFl;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-25 09:24:54 +0000