aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/hopkins/computer.cpp6
-rw-r--r--engines/hopkins/dialogs.cpp12
-rw-r--r--engines/hopkins/graphics.cpp26
-rw-r--r--engines/hopkins/graphics.h4
-rw-r--r--engines/hopkins/hopkins.cpp126
-rw-r--r--engines/hopkins/menu.cpp2
-rw-r--r--engines/hopkins/objects.cpp30
-rw-r--r--engines/hopkins/objects.h14
-rw-r--r--engines/hopkins/script.cpp140
-rw-r--r--engines/hopkins/sound.cpp90
-rw-r--r--engines/hopkins/sound.h15
-rw-r--r--engines/hopkins/talk.cpp12
12 files changed, 229 insertions, 248 deletions
diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp
index d101a67278..a70a8de615 100644
--- a/engines/hopkins/computer.cpp
+++ b/engines/hopkins/computer.cpp
@@ -564,9 +564,9 @@ void ComputerManager::displayGamesSubMenu() {
_breakoutLevel = (int16 *)_vm->_globals.freeMemory((byte *)_breakoutLevel);
_vm->_objectsManager._sprite[0]._spriteData = oldSpriteData;
- _vm->_soundManager.DEL_SAMPLE(1);
- _vm->_soundManager.DEL_SAMPLE(2);
- _vm->_soundManager.DEL_SAMPLE(3);
+ _vm->_soundManager.removeSample(1);
+ _vm->_soundManager.removeSample(2);
+ _vm->_soundManager.removeSample(3);
_vm->_globals._speed = oldSpeed;
_vm->_eventsManager._breakoutFl = false;
setVideoMode();
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
index 93f86598bc..7695f8c829 100644
--- a/engines/hopkins/dialogs.cpp
+++ b/engines/hopkins/dialogs.cpp
@@ -88,7 +88,7 @@ void DialogsManager::showOptionsDialog() {
++_vm->_soundManager._musicVolume;
if (_vm->_soundManager._musicVolume <= 12)
- _vm->_soundManager.playSound("bruit2.wav");
+ _vm->_soundManager.playSoundFile("bruit2.wav");
else
_vm->_soundManager._musicVolume = 12;
_vm->_soundManager.MODSetMusicVolume(_vm->_soundManager._musicVolume);
@@ -99,7 +99,7 @@ void DialogsManager::showOptionsDialog() {
if (!_vm->_soundManager._musicOffFl && mousePos.x >= _vm->_graphicsManager._scrollOffset + 331 && mousePos.y > 113 && mousePos.x <= _vm->_graphicsManager._scrollOffset + 358 && mousePos.y <= 138) {
--_vm->_soundManager._musicVolume;
if (_vm->_soundManager._musicVolume >= 0)
- _vm->_soundManager.playSound("bruit2.wav");
+ _vm->_soundManager.playSoundFile("bruit2.wav");
else
_vm->_soundManager._musicVolume = 0;
@@ -112,7 +112,7 @@ void DialogsManager::showOptionsDialog() {
if (mousePos.x >= _vm->_graphicsManager._scrollOffset + 300 && mousePos.y > 140 && mousePos.x <= _vm->_graphicsManager._scrollOffset + 327 && mousePos.y <= 165) {
++_vm->_soundManager._soundVolume;
if (_vm->_soundManager._soundVolume <= 16)
- _vm->_soundManager.playSound("bruit2.wav");
+ _vm->_soundManager.playSoundFile("bruit2.wav");
else
_vm->_soundManager._soundVolume = 16;
_vm->_soundManager.MODSetSampleVolume();
@@ -123,7 +123,7 @@ void DialogsManager::showOptionsDialog() {
if (!_vm->_soundManager._soundOffFl && mousePos.x >= _vm->_graphicsManager._scrollOffset + 331 && mousePos.y > 140 && mousePos.x <= _vm->_graphicsManager._scrollOffset + 358 && mousePos.y <= 165) {
--_vm->_soundManager._soundVolume;
if (_vm->_soundManager._soundVolume >= 0)
- _vm->_soundManager.playSound("bruit2.wav");
+ _vm->_soundManager.playSoundFile("bruit2.wav");
else
_vm->_soundManager._soundVolume = 0;
_vm->_soundManager.MODSetSampleVolume();
@@ -137,7 +137,7 @@ void DialogsManager::showOptionsDialog() {
++_vm->_soundManager._voiceVolume;
if (_vm->_soundManager._voiceVolume <= 16)
- _vm->_soundManager.playSound("bruit2.wav");
+ _vm->_soundManager.playSoundFile("bruit2.wav");
else
_vm->_soundManager._voiceVolume = 16;
_vm->_soundManager.MODSetVoiceVolume();
@@ -148,7 +148,7 @@ void DialogsManager::showOptionsDialog() {
if (!_vm->_soundManager._voiceOffFl && mousePos.x >= _vm->_graphicsManager._scrollOffset + 331 && mousePos.y > 167 && mousePos.x <= _vm->_graphicsManager._scrollOffset + 358 && mousePos.y <= 192) {
--_vm->_soundManager._voiceVolume;
if (_vm->_soundManager._voiceVolume >= 0)
- _vm->_soundManager.playSound("bruit2.wav");
+ _vm->_soundManager.playSoundFile("bruit2.wav");
else
_vm->_soundManager._voiceVolume = 0;
_vm->_soundManager.MODSetVoiceVolume();
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index 1009b1b3ed..108cad6f50 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -1670,17 +1670,7 @@ void GraphicsManager::displayFont(byte *surface, const byte *spriteData, int xp,
} while (yCtr != 1);
}
-// Init Screen
-void GraphicsManager::INI_ECRAN(const Common::String &file, bool initializeScreen) {
- OPTI_INI(file, 0, initializeScreen);
-}
-
-// Init Screen 2
-void GraphicsManager::INI_ECRAN2(const Common::String &file, bool initializeScreen) {
- OPTI_INI(file, 2, initializeScreen);
-}
-
-void GraphicsManager::OPTI_INI(const Common::String &file, int mode, bool initializeScreen) {
+void GraphicsManager::initScreen(const Common::String &file, int mode, bool initializeScreen) {
Common::String filename = file + ".ini";
byte *ptr = _vm->_fileManager.searchCat(filename, 1);
@@ -1723,16 +1713,14 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int mode, bool initia
} while (!doneFlag);
}
_vm->_globals.freeMemory(ptr);
- if (mode != 1) {
- _vm->_globals._answerBuffer = _vm->_globals.freeMemory(_vm->_globals._answerBuffer);
+ _vm->_globals._answerBuffer = _vm->_globals.freeMemory(_vm->_globals._answerBuffer);
- filename = file + ".rep";
- byte *dataP = _vm->_fileManager.searchCat(filename, 2);
- if (dataP == g_PTRNUL)
- dataP = _vm->_fileManager.loadFile(filename);
+ filename = file + ".rep";
+ byte *dataP = _vm->_fileManager.searchCat(filename, 2);
+ if (dataP == g_PTRNUL)
+ dataP = _vm->_fileManager.loadFile(filename);
- _vm->_globals._answerBuffer = dataP;
- }
+ _vm->_globals._answerBuffer = dataP;
_vm->_objectsManager._forceZoneFl = true;
_vm->_objectsManager._changeVerbFl = false;
}
diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h
index af06e8ce88..4b9d328956 100644
--- a/engines/hopkins/graphics.h
+++ b/engines/hopkins/graphics.h
@@ -145,6 +145,7 @@ public:
void scrollScreen(int amount);
int zoomIn(int v, int percentage);
int zoomOut(int v, int percentage);
+ void initScreen(const Common::String &file, int mode, bool initializeScreen);
void Restore_Mem(byte *destSurface, const byte *src, int xp, int yp, int width, int height);
void addVesaSegment(int x1, int y1, int x2, int y2);
@@ -164,11 +165,8 @@ public:
void Trans_bloc2(byte *surface, byte *col, int size);
void VISU_ALL();
void FIN_VISU();
- void INI_ECRAN(const Common::String &file, bool initializeScreen);
- void INI_ECRAN2(const Common::String &file, bool initializeScreen);
void NB_SCREEN(bool initPalette);
void Reduc_Ecran(const byte *srcSruface, byte *destSurface, int xp, int yp, int width, int height, int zoom);
- void OPTI_INI(const Common::String &file, int mode, bool initializeScreen);
void Copy_WinScan_Vbe3(const byte *srcData, byte *destSurface);
void Copy_WinScan_Vbe(const byte *srcP, byte *destP);
void Copy_Video_Vbe16(const byte *srcData);
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index de89ab52f8..1a4d497ef3 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -184,7 +184,7 @@ bool HopkinsEngine::runWin95Demo() {
case 3:
if (!_globals._saveData->_data[svField170]) {
- _soundManager.WSOUND(3);
+ _soundManager.playSound(3);
if (getPlatform() == Common::kPlatformOS2 || getPlatform() == Common::kPlatformBeOS)
_graphicsManager.loadImage("fond");
else {
@@ -209,10 +209,10 @@ bool HopkinsEngine::runWin95Demo() {
else
_animationManager.playAnim("BANKUK.ANM", 200, 28, 200);
_soundManager._specialSoundNum = 0;
- _soundManager.DEL_SAMPLE(1);
- _soundManager.DEL_SAMPLE(2);
- _soundManager.DEL_SAMPLE(3);
- _soundManager.DEL_SAMPLE(4);
+ _soundManager.removeSample(1);
+ _soundManager.removeSample(2);
+ _soundManager.removeSample(3);
+ _soundManager.removeSample(4);
_graphicsManager.fadeOutLong();
_globals._saveData->_data[svField170] = 1;
}
@@ -371,7 +371,7 @@ bool HopkinsEngine::runWin95Demo() {
break;
case 150:
- _soundManager.WSOUND(28);
+ _soundManager.playSound(28);
_globals.iRegul = 4; // CHECKME!
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
@@ -383,7 +383,7 @@ bool HopkinsEngine::runWin95Demo() {
break;
case 151:
- _soundManager.WSOUND(28);
+ _soundManager.playSound(28);
_globals.iRegul = 4; // CHECKME!
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
@@ -398,7 +398,7 @@ bool HopkinsEngine::runWin95Demo() {
break;
case 152:
- _soundManager.WSOUND(28);
+ _soundManager.playSound(28);
_globals.iRegul = 4; // CHECKME!
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
@@ -489,7 +489,7 @@ bool HopkinsEngine::runLinuxDemo() {
case 3:
if (!_globals._saveData->_data[svField170]) {
- _soundManager.WSOUND(3);
+ _soundManager.playSound(3);
if (getPlatform() == Common::kPlatformOS2 || getPlatform() == Common::kPlatformBeOS)
_graphicsManager.loadImage("fond");
else {
@@ -517,10 +517,10 @@ bool HopkinsEngine::runLinuxDemo() {
else
_animationManager.playAnim("BANKUK.ANM", 200, 28, 200);
_soundManager._specialSoundNum = 0;
- _soundManager.DEL_SAMPLE(1);
- _soundManager.DEL_SAMPLE(2);
- _soundManager.DEL_SAMPLE(3);
- _soundManager.DEL_SAMPLE(4);
+ _soundManager.removeSample(1);
+ _soundManager.removeSample(2);
+ _soundManager.removeSample(3);
+ _soundManager.removeSample(4);
_globals._saveData->_data[svField170] = 1;
}
@@ -689,7 +689,7 @@ bool HopkinsEngine::runLinuxDemo() {
break;
case 150:
- _soundManager.WSOUND(16);
+ _soundManager.playSound(16);
_globals.iRegul = 1;
_graphicsManager.lockScreen();
@@ -703,7 +703,7 @@ bool HopkinsEngine::runLinuxDemo() {
break;
case 151:
- _soundManager.WSOUND(16);
+ _soundManager.playSound(16);
_globals.iRegul = 1;
_graphicsManager.lockScreen();
@@ -717,7 +717,7 @@ bool HopkinsEngine::runLinuxDemo() {
break;
case 152:
- _soundManager.WSOUND(16);
+ _soundManager.playSound(16);
_globals.iRegul = 1;
_graphicsManager.lockScreen();
@@ -736,7 +736,7 @@ bool HopkinsEngine::runLinuxDemo() {
bool HopkinsEngine::runFull() {
if (getPlatform() == Common::kPlatformLinux)
- _soundManager.WSOUND(16);
+ _soundManager.playSound(16);
_globals.loadObjects();
_objectsManager.changeObject(14);
@@ -828,7 +828,7 @@ bool HopkinsEngine::runFull() {
case 3:
if (!_globals._saveData->_data[svField170]) {
- _soundManager.WSOUND(3);
+ _soundManager.playSound(3);
if (getPlatform() == Common::kPlatformOS2 || getPlatform() == Common::kPlatformBeOS)
_graphicsManager.loadImage("fond");
else {
@@ -860,10 +860,10 @@ bool HopkinsEngine::runFull() {
_animationManager.playAnim("BANQUE.ANM", 200, 28, 200);
}
_soundManager._specialSoundNum = 0;
- _soundManager.DEL_SAMPLE(1);
- _soundManager.DEL_SAMPLE(2);
- _soundManager.DEL_SAMPLE(3);
- _soundManager.DEL_SAMPLE(4);
+ _soundManager.removeSample(1);
+ _soundManager.removeSample(2);
+ _soundManager.removeSample(3);
+ _soundManager.removeSample(4);
if (getPlatform() != Common::kPlatformLinux)
_graphicsManager.fadeOutLong();
_globals._saveData->_data[svField170] = 1;
@@ -976,17 +976,17 @@ bool HopkinsEngine::runFull() {
_graphicsManager.clearScreen();
_graphicsManager.unlockScreen();
_graphicsManager.clearPalette();
- _soundManager.WSOUND_OFF();
+ _soundManager.stopSound();
if (getPlatform() == Common::kPlatformLinux) {
- _soundManager.WSOUND(29);
+ _soundManager.playSound(29);
_graphicsManager.FADE_LINUX = 2;
_animationManager.playAnim("PURG1A.ANM", 12, 18, 50);
} else if (getPlatform() == Common::kPlatformWindows) {
- _soundManager.WSOUND(29);
+ _soundManager.playSound(29);
_animationManager.playAnim("PURG1A.ANM", 12, 18, 50);
_graphicsManager.fadeOutShort();
} else {
- _soundManager.WSOUND(6);
+ _soundManager.playSound(6);
_animationManager.playAnim("PURG1A.ANM", 12, 18, 50);
_graphicsManager.fadeOutShort();
}
@@ -1018,12 +1018,12 @@ bool HopkinsEngine::runFull() {
_objectsManager.PERSONAGE2("IM20", "IM20", "ANIM20", "IM20", 6, true);
if (_globals._exitId == 17) {
_globals.iRegul = 1;
- _soundManager.WSOUND_OFF();
+ _soundManager.stopSound();
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
_graphicsManager.unlockScreen();
_graphicsManager.clearPalette();
- _soundManager.WSOUND(6);
+ _soundManager.playSound(6);
if (getPlatform() == Common::kPlatformLinux)
_graphicsManager.FADE_LINUX = 2;
_animationManager.playAnim("PURG2A.ANM", 12, 18, 50);
@@ -1132,7 +1132,7 @@ bool HopkinsEngine::runFull() {
_globals._disableInventFl = false;
_objectsManager._forestFl = true;
Common::String im = Common::String::format("IM%d", _globals._exitId);
- _soundManager.WSOUND(13);
+ _soundManager.playSound(13);
if (_objectsManager._forestSprite == g_PTRNUL) {
_objectsManager._forestSprite = _objectsManager.loadSprite("HOPDEG.SPR");
_soundManager.loadSample(1, "SOUND41.WAV");
@@ -1141,7 +1141,7 @@ bool HopkinsEngine::runFull() {
if (_globals._exitId < 35 || _globals._exitId > 49) {
_objectsManager._forestSprite = _globals.freeMemory(_objectsManager._forestSprite);
_objectsManager._forestFl = false;
- _soundManager.DEL_SAMPLE(1);
+ _soundManager.removeSample(1);
}
break;
}
@@ -1384,12 +1384,12 @@ bool HopkinsEngine::runFull() {
_objectsManager.PERSONAGE2("IM97", "IM97", "ANIM97", "IM97", 19, false);
if (_globals._exitId == 18) {
_globals.iRegul = 1;
- _soundManager.WSOUND_OFF();
+ _soundManager.stopSound();
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
_graphicsManager.unlockScreen();
_graphicsManager.clearPalette();
- _soundManager.WSOUND(6);
+ _soundManager.playSound(6);
_animationManager.playAnim("PURG1A.ANM", 12, 18, 50);
_graphicsManager.fadeOutShort();
_globals.iRegul = 0;
@@ -1462,7 +1462,7 @@ bool HopkinsEngine::runFull() {
break;
case 150:
- _soundManager.WSOUND(16);
+ _soundManager.playSound(16);
_globals.iRegul = 1;
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
@@ -1476,7 +1476,7 @@ bool HopkinsEngine::runFull() {
break;
case 151:
- _soundManager.WSOUND(16);
+ _soundManager.playSound(16);
_globals.iRegul = 1;
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
@@ -1490,7 +1490,7 @@ bool HopkinsEngine::runFull() {
break;
case 152:
- _soundManager.WSOUND(16);
+ _soundManager.playSound(16);
_globals.iRegul = 1;
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
@@ -1511,11 +1511,11 @@ bool HopkinsEngine::runFull() {
case 199:
_globals.PERSO = _globals.freeMemory(_globals.PERSO);
_globals.iRegul = 1;
- _soundManager.WSOUND_OFF();
- _soundManager.WSOUND(23);
+ _soundManager.stopSound();
+ _soundManager.playSound(23);
_globals._exitId = handleBaseMap(); // Handles the base map (non-Windows)
//_globals._exitId = WBASE(); // Handles the 3D Doom level (Windows)
- _soundManager.WSOUND_OFF();
+ _soundManager.stopSound();
_globals.PERSO = _fileManager.loadFile("PERSO.SPR");
_globals.PERSO_TYPE = 0;
_globals.iRegul = 0;
@@ -1603,7 +1603,7 @@ void HopkinsEngine::playIntro() {
_eventsManager._mouseFl = false;
_globals.iRegul = 1;
_eventsManager.VBL();
- _soundManager.WSOUND(16);
+ _soundManager.playSound(16);
_animationManager._clearAnimationFl = true;
_animationManager.playAnim("J1.anm", 12, 12, 50);
if (shouldQuit() || _eventsManager._escKeyFl)
@@ -1627,7 +1627,7 @@ void HopkinsEngine::playIntro() {
_graphicsManager.unlockScreen();
_graphicsManager.clearPalette();
_graphicsManager.DD_VBL();
- _soundManager.WSOUND(11);
+ _soundManager.playSound(11);
_graphicsManager.loadImage("intro1");
_graphicsManager.scrollScreen(0);
_graphicsManager._scrollOffset = 0;
@@ -1671,7 +1671,7 @@ void HopkinsEngine::playIntro() {
_graphicsManager.scrollScreen(0);
_animationManager.loadAnim("INTRO2");
_graphicsManager.VISU_ALL();
- _soundManager.WSOUND(23);
+ _soundManager.playSound(23);
_objectsManager.stopBobAnimation(3);
_objectsManager.stopBobAnimation(5);
_graphicsManager._scrollOffset = 0;
@@ -1712,7 +1712,7 @@ void HopkinsEngine::playIntro() {
_graphicsManager.scrollScreen(0);
_animationManager.loadAnim("INTRO2");
_graphicsManager.VISU_ALL();
- _soundManager.WSOUND(23);
+ _soundManager.playSound(23);
_objectsManager.stopBobAnimation(3);
_objectsManager.stopBobAnimation(5);
_objectsManager.stopBobAnimation(1);
@@ -1787,7 +1787,7 @@ void HopkinsEngine::playIntro() {
_graphicsManager.fadeOutLong();
_graphicsManager.FIN_VISU();
_animationManager._clearAnimationFl = true;
- _soundManager.WSOUND(3);
+ _soundManager.playSound(3);
_soundManager._specialSoundNum = 1;
_animationManager.playAnim("INTRO1.anm", 10, 24, 18);
_soundManager._specialSoundNum = 0;
@@ -1842,7 +1842,7 @@ void HopkinsEngine::handleNotAvailable(int sortie) {
}
void HopkinsEngine::displayEndDemo() {
- _soundManager.WSOUND(28);
+ _soundManager.playSound(28);
if (_globals._language == LANG_FR)
_graphicsManager.loadImage("endfr");
else
@@ -1910,7 +1910,7 @@ void HopkinsEngine::endLinuxDemo() {
_eventsManager._breakoutFl = false;
_globals._disableInventFl = true;
_graphicsManager.loadImage("BOX");
- _soundManager.WSOUND(28);
+ _soundManager.playSound(28);
_graphicsManager.fadeInLong();
_eventsManager.mouseOn();
_eventsManager.changeMouseCursor(0);
@@ -1973,7 +1973,7 @@ void HopkinsEngine::BASE() {
_graphicsManager.unlockScreen();
_graphicsManager.clearPalette();
_animationManager._clearAnimationFl = true;
- _soundManager.WSOUND(25);
+ _soundManager.playSound(25);
_animationManager.playAnim("base00a.anm", 10, 18, 18);
if (!_eventsManager._escKeyFl)
_animationManager.playAnim("base05a.anm", 10, 18, 18);
@@ -2012,7 +2012,7 @@ void HopkinsEngine::BASED() {
_graphicsManager.unlockScreen();
_graphicsManager.clearPalette();
_animationManager.NO_SEQ = false;
- _soundManager.WSOUND(26);
+ _soundManager.playSound(26);
_globals.iRegul = 1;
_globals._disableInventFl = true;
_animationManager.NO_COUL = true;
@@ -2022,7 +2022,7 @@ void HopkinsEngine::BASED() {
_graphicsManager.loadImage("IM92");
_animationManager.loadAnim("ANIM92");
_graphicsManager.VISU_ALL();
- _objectsManager.INILINK("IM92");
+ _objectsManager.loadLinkFile("IM92");
for (int cpt = 0; cpt <= 4; cpt++)
_eventsManager.VBL();
@@ -2049,7 +2049,7 @@ void HopkinsEngine::playEnding() {
_graphicsManager._scrollOffset = 0;
_globals._cityMapEnabledFl = false;
_globals.iRegul = 1;
- _soundManager.WSOUND(26);
+ _soundManager.playSound(26);
_linesManager._route = (RouteItem *)g_PTRNUL;
_globals.NOMARCHE = true;
_globals._exitId = 0;
@@ -2089,7 +2089,7 @@ void HopkinsEngine::playEnding() {
_eventsManager.VBL();
while (_objectsManager.getBobAnimDataIdx(7) != 54);
- _soundManager.PLAY_SAMPLE2(1);
+ _soundManager.playSample(1);
do
_eventsManager.VBL();
@@ -2125,7 +2125,7 @@ void HopkinsEngine::playEnding() {
_graphicsManager.FADE_LINUX = 2;
_animationManager.playAnim("BERM.ANM", 100, 24, 300);
_graphicsManager.FIN_VISU();
- _soundManager.DEL_SAMPLE(1);
+ _soundManager.removeSample(1);
_graphicsManager.loadImage("PLAN3");
_graphicsManager.fadeInLong();
@@ -2141,7 +2141,7 @@ void HopkinsEngine::playEnding() {
_soundManager._specialSoundNum = 0;
_graphicsManager.FADE_LINUX = 2;
_animationManager.playAnim("JOUR2A.anm", 12, 12, 1000);
- _soundManager.WSOUND(11);
+ _soundManager.playSound(11);
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
_graphicsManager.unlockScreen();
@@ -2170,7 +2170,7 @@ void HopkinsEngine::playEnding() {
_eventsManager.VBL();
while (_objectsManager.getBobAnimDataIdx(8) != 5);
- _soundManager.PLAY_SOUND2("SOUND41.WAV");
+ _soundManager.directPlayWav("SOUND41.WAV");
do
_eventsManager.VBL();
@@ -2178,8 +2178,8 @@ void HopkinsEngine::playEnding() {
_graphicsManager.fadeOutLong();
_graphicsManager.FIN_VISU();
- _soundManager.DEL_SAMPLE(1);
- _soundManager.WSOUND(16);
+ _soundManager.removeSample(1);
+ _soundManager.playSound(16);
_globals.iRegul = 1;
_soundManager._specialSoundNum = 0;
_dialogsManager._removeInventFl = false;
@@ -2194,7 +2194,7 @@ void HopkinsEngine::playEnding() {
}
void HopkinsEngine::displayPlane() {
- _soundManager.WSOUND(28);
+ _soundManager.playSound(28);
_globals.iRegul = 1;
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
@@ -2466,7 +2466,7 @@ void HopkinsEngine::displayCredits() {
_globals._creditsPosY = 436;
_graphicsManager.loadImage("GENERIC");
_graphicsManager.fadeInLong();
- _soundManager.WSOUND(28);
+ _soundManager.playSound(28);
_eventsManager._mouseFl = false;
_globals.iRegul = 3;
_globals.Credit_bx = _globals.Credit_bx1 = _globals.Credit_by = _globals.Credit_by1 = -1;
@@ -2511,7 +2511,7 @@ void HopkinsEngine::displayCredits() {
++soundId;
if (soundId > 31)
soundId = 28;
- _soundManager.WSOUND(soundId);
+ _soundManager.playSound(soundId);
}
_globals.Credit_bx = -1;
_globals.Credit_bx1 = -1;
@@ -2741,19 +2741,19 @@ void HopkinsEngine::OCEAN(int16 curExitId, Common::String backgroundFilename, Di
_globals.NOMARCHE = false;
_globals._exitId = 0;
_globals._disableInventFl = true;
- _soundManager.WSOUND(soundId);
+ _soundManager.playSound(soundId);
_globals.PERSO = _fileManager.loadFile("VAISSEAU.SPR");
if (backgroundFilename.size())
_graphicsManager.loadImage(backgroundFilename);
if (curExitId == 77)
- _objectsManager.INILINK("IM77");
+ _objectsManager.loadLinkFile("IM77");
else if (curExitId == 84)
- _objectsManager.INILINK("IM84");
+ _objectsManager.loadLinkFile("IM84");
else if (curExitId == 91)
- _objectsManager.INILINK("IM91");
+ _objectsManager.loadLinkFile("IM91");
else
- _objectsManager.INILINK("ocean");
+ _objectsManager.loadLinkFile("ocean");
if (!exit1)
_linesManager.disableZone(1);
diff --git a/engines/hopkins/menu.cpp b/engines/hopkins/menu.cpp
index f8868ddf27..20b531ff7e 100644
--- a/engines/hopkins/menu.cpp
+++ b/engines/hopkins/menu.cpp
@@ -92,7 +92,7 @@ int MenuManager::menu() {
_vm->_eventsManager._mouseCursorId = 0;
_vm->_eventsManager._mouseSpriteId = 0;
- _vm->_soundManager.WSOUND(28);
+ _vm->_soundManager.playSound(28);
// Loop to make menu selection
bool selectionMade = false;
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index abc608c449..4142913950 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -1745,7 +1745,7 @@ void ObjectsManager::handleCityMap() {
_spritePtr = g_PTRNUL;
_vm->_globals._exitId = 0;
_vm->_globals.NOT_VERIF = true;
- _vm->_soundManager.WSOUND(31);
+ _vm->_soundManager.playSound(31);
_vm->_globals.iRegul = 1;
_vm->_graphicsManager.loadImage("PLAN");
_vm->_linesManager.loadLines("PLAN.OB2");
@@ -1754,7 +1754,7 @@ void ObjectsManager::handleCityMap() {
_spritePtr = _vm->_fileManager.loadFile("VOITURE.SPR");
_vm->_animationManager.loadAnim("PLAN");
_vm->_graphicsManager.VISU_ALL();
- _vm->_graphicsManager.INI_ECRAN2("PLAN", false);
+ _vm->_graphicsManager.initScreen("PLAN", 2, false);
for (int i = 0; i <= 15; i++)
_vm->_globals.B_CACHE_OFF(i);
_vm->_globals.B_CACHE_OFF(19);
@@ -2678,7 +2678,7 @@ void ObjectsManager::handleSpecialGames() {
setBobAnimation(6);
_vm->_globals._saveData->_data[svField261] = 2;
_vm->_linesManager.disableZone(15);
- _vm->_soundManager.playSound("SOUND75.WAV");
+ _vm->_soundManager.playSoundFile("SOUND75.WAV");
}
if (_vm->_globals._saveData->_data[svField261] == 2 && getBobAnimDataIdx(6) == 6) {
stopBobAnimation(6);
@@ -3052,7 +3052,7 @@ int ObjectsManager::getBobFrameIndex(int idx) {
return _bob[idx]._frameIndex;
}
-void ObjectsManager::INILINK(const Common::String &file) {
+void ObjectsManager::loadLinkFile(const Common::String &file) {
Common::File f;
Common::String filename = file + ".LNK";
byte *ptr = _vm->_fileManager.searchCat(filename, 3);
@@ -3641,7 +3641,7 @@ void ObjectsManager::handleForest(int screenId, int minX, int maxX, int minY, in
if (_vm->_globals._saveData->_data[savegameIdx] == 1) {
if (((idx == 1 || idx == 2) && getBobAnimDataIdx(idx) == 26) || ((idx == 3 || idx == 4) && getBobAnimDataIdx(idx) == 27)) {
_vm->_dialogsManager._removeInventFl = true;
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
_vm->_globals._saveData->_data[savegameIdx] = 4;
}
}
@@ -3678,29 +3678,29 @@ void ObjectsManager::lockAnimX(int idx, int x) {
* Game scene control method
*/
void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Common::String &linkFile,
- const Common::String &animFile, const Common::String &s4, int v, bool initializeScreen) {
+ const Common::String &animFile, const Common::String &s4, int soundNum, bool initializeScreen) {
_vm->_dialogsManager._inventFl = false;
_vm->_eventsManager._gameKey = KEY_NONE;
_vm->_dialogsManager._removeInventFl = false;
_vm->_graphicsManager._scrollOffset = 0;
_vm->_globals._cityMapEnabledFl = false;
_vm->_globals.iRegul = 1;
- _vm->_soundManager.WSOUND(v);
+ _vm->_soundManager.playSound(soundNum);
_vm->_linesManager._route = (RouteItem *)g_PTRNUL;
_vm->_globals.NOMARCHE = true;
_vm->_globals._exitId = 0;
if (!backgroundFile.empty())
_vm->_graphicsManager.loadImage(backgroundFile);
if (!linkFile.empty())
- INILINK(linkFile);
+ loadLinkFile(linkFile);
if (!animFile.empty())
_vm->_animationManager.loadAnim(animFile);
_vm->_graphicsManager.VISU_ALL();
if (!s4.empty()) {
if (initializeScreen)
- _vm->_graphicsManager.INI_ECRAN(s4, initializeScreen);
+ _vm->_graphicsManager.initScreen(s4, 0, initializeScreen);
else
- _vm->_graphicsManager.INI_ECRAN2(s4, initializeScreen);
+ _vm->_graphicsManager.initScreen(s4, 2, initializeScreen);
}
_vm->_eventsManager.mouseOn();
if (_vm->_globals._screenId == 61) {
@@ -3766,7 +3766,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo
* Game scene control method
*/
void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Common::String &linkFile,
- const Common::String &animFile, const Common::String &s4, int v, bool initializeScreen) {
+ const Common::String &animFile, const Common::String &s4, int soundNum, bool initializeScreen) {
_vm->_dialogsManager._inventFl = false;
_vm->_eventsManager._gameKey = KEY_NONE;
_verb = 4;
@@ -3777,21 +3777,21 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm
_vm->_globals.NOMARCHE = false;
_vm->_globals._exitId = 0;
_vm->_globals.NOT_VERIF = true;
- _vm->_soundManager.WSOUND(v);
+ _vm->_soundManager.playSound(soundNum);
_vm->_globals.iRegul = 1;
if (!backgroundFile.empty())
_vm->_graphicsManager.loadImage(backgroundFile);
if (!linkFile.empty())
- INILINK(linkFile);
+ loadLinkFile(linkFile);
if (!animFile.empty()) {
_vm->_animationManager.loadAnim(animFile);
_vm->_graphicsManager.VISU_ALL();
}
if (!s4.empty()) {
if (initializeScreen)
- _vm->_graphicsManager.INI_ECRAN(s4, initializeScreen);
+ _vm->_graphicsManager.initScreen(s4, 0, initializeScreen);
else
- _vm->_graphicsManager.INI_ECRAN2(s4, initializeScreen);
+ _vm->_graphicsManager.initScreen(s4, 2, initializeScreen);
}
_vm->_eventsManager.mouseOn();
_vm->_eventsManager._mouseCursorId = 4;
diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h
index 7dc58b0b10..40726bf304 100644
--- a/engines/hopkins/objects.h
+++ b/engines/hopkins/objects.h
@@ -131,13 +131,11 @@ private:
void changeCharacterHead(PlayerCharacter oldCharacter, PlayerCharacter newCharacter);
void nextVerbIcon();
-
int getBobFrameIndex(int idx);
+ void handleForest(int screenId, int minX, int maxX, int minY, int maxY, int idx);
void SPECIAL_INI();
-
void ACTION(const byte *spriteData, const Common::String &actionStr, int a3, int a4, int speed, bool flipFl);
- void handleForest(int screenId, int minX, int maxX, int minY, int maxY, int idx);
public:
bool _disableFl;
bool _forestFl;
@@ -182,6 +180,7 @@ public:
int getWidth(const byte *objectData, int idx);
int getHeight(const byte *objectData, int idx);
byte *loadSprite(const Common::String &file);
+ void loadLinkFile(const Common::String &file);
void addStaticSprite(const byte *spriteData, Common::Point pos, int idx, int spriteIndex, int zoomFactor, bool flipFl, int a8, int a9);
void animateSprite(int idx);
void removeSprite(int idx);
@@ -225,22 +224,21 @@ public:
void doActionRight(int idx);
void doActionFront(int idx);
void doActionLeft(int idx);
+ void doActionDiagRight(int idx);
+ void doActionDiagLeft(int idx);
void PERSONAGE(const Common::String &backgroundFile, const Common::String &linkFile,
- const Common::String &animFile, const Common::String &s4, int v, bool initializeScreen);
+ const Common::String &animFile, const Common::String &s4, int soundNum, bool initializeScreen);
void PERSONAGE2(const Common::String &backgroundFile, const Common::String &linkFile,
- const Common::String &animFile, const Common::String &s4, int v, bool initializeScreen);
+ const Common::String &animFile, const Common::String &s4, int soundNum, bool initializeScreen);
byte *CAPTURE_OBJET(int objIndex, bool mode);
void OPTI_OBJET();
void BOB_OFF(int idx);
void BOB_VISU(int idx);
- void INILINK(const Common::String &file);
void SPACTION(byte *spriteData, const Common::String &animationSeq, int a3, int a4, int speed, bool flipFl);
void BOB_VIVANT(int idx);
void VBOB(byte *src, int idx, int xp, int yp, int frameIndex);
void VBOB_OFF(int idx);
- void doActionDiagRight(int idx);
- void doActionDiagLeft(int idx);
void OPTI_ONE(int idx, int animIdx, int destPosi, int animAction);
void SCI_OPTI_ONE(int idx, int animIdx, int a3, int a4);
void GOHOME();
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index 64f5fe2a57..cf2b61c8bf 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -549,7 +549,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
if ((_vm->getPlatform() == Common::kPlatformWindows) && _vm->getIsDemo()) {
_vm->_graphicsManager.fadeOutLong();
} else {
- _vm->_soundManager.playSound("SOUND17.WAV");
+ _vm->_soundManager.playSoundFile("SOUND17.WAV");
_vm->_graphicsManager.FADE_LINUX = 2;
_vm->_animationManager.playSequence2("HELICO.SEQ", 10, 4, 10);
}
@@ -602,7 +602,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_graphicsManager.FIN_VISU();
if ((_vm->getPlatform() == Common::kPlatformWindows) && _vm->getIsDemo())
- _vm->_soundManager.playSound("SOUND17.WAV");
+ _vm->_soundManager.playSoundFile("SOUND17.WAV");
_vm->_soundManager._specialSoundNum = 14;
_vm->_graphicsManager.FADE_LINUX = 2;
@@ -713,9 +713,9 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_soundManager._specialSoundNum = 0;
_vm->_graphicsManager.FADE_LINUX = 2;
_vm->_animationManager.playAnim("CREVE17.ANM", 24, 24, 200);
- _vm->_soundManager.DEL_SAMPLE(1);
- _vm->_soundManager.DEL_SAMPLE(2);
- _vm->_soundManager.DEL_SAMPLE(3);
+ _vm->_soundManager.removeSample(1);
+ _vm->_soundManager.removeSample(2);
+ _vm->_soundManager.removeSample(3);
_vm->_graphicsManager._noFadingFl = true;
break;
@@ -766,37 +766,37 @@ int ScriptManager::handleOpcode(byte *dataP) {
return -1; // Exiting game
if (_vm->_objectsManager.getBobAnimDataIdx(9) == 4 && !v15) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v15 = true;
}
if (_vm->_objectsManager.getBobAnimDataIdx(9) == 5)
v15 = false;
if (_vm->_objectsManager.getBobAnimDataIdx(9) == 16 && !v15) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v15 = true;
}
if (_vm->_objectsManager.getBobAnimDataIdx(9) == 17)
v15 = false;
if (_vm->_objectsManager.getBobAnimDataIdx(9) == 28 && !v15) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v15 = true;
}
if (_vm->_objectsManager.getBobAnimDataIdx(9) == 29)
v15 = false;
if (_vm->_objectsManager.getBobAnimDataIdx(10) == 10 && !v15) {
- _vm->_soundManager.PLAY_SAMPLE2(2);
+ _vm->_soundManager.playSample(2);
v15 = true;
}
if (_vm->_objectsManager.getBobAnimDataIdx(10) == 11)
v15 = false;
if (_vm->_objectsManager.getBobAnimDataIdx(10) == 22 && !v15) {
- _vm->_soundManager.PLAY_SAMPLE2(2);
+ _vm->_soundManager.playSample(2);
v15 = true;
}
if (_vm->_objectsManager.getBobAnimDataIdx(10) == 23)
v15 = false;
if (_vm->_objectsManager.getBobAnimDataIdx(10) == 33 && !v15) {
- _vm->_soundManager.PLAY_SAMPLE2(2);
+ _vm->_soundManager.playSample(2);
v15 = true;
}
if (_vm->_objectsManager.getBobAnimDataIdx(10) == 34)
@@ -812,8 +812,8 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.animateSprite(0);
_vm->_objectsManager.stopBobAnimation(9);
_vm->_objectsManager.stopBobAnimation(10);
- _vm->_soundManager.DEL_SAMPLE(1);
- _vm->_soundManager.DEL_SAMPLE(2);
+ _vm->_soundManager.removeSample(1);
+ _vm->_soundManager.removeSample(2);
break;
}
@@ -838,19 +838,19 @@ int ScriptManager::handleOpcode(byte *dataP) {
return -1; // Exiting game
if (_vm->_objectsManager.getBobAnimDataIdx(9) == 4 && !v20) {
- _vm->_soundManager.PLAY_SOUND2("SOUND44.WAV");
+ _vm->_soundManager.directPlayWav("SOUND44.WAV");
v20 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(9) == 5)
v20 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(9) == 18 && !v20) {
- _vm->_soundManager.PLAY_SOUND2("SOUND46.WAV");
+ _vm->_soundManager.directPlayWav("SOUND46.WAV");
v20 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(9) == 19)
v20 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(10) == 11 && !v20) {
- _vm->_soundManager.PLAY_SOUND2("SOUND45.WAV");
+ _vm->_soundManager.directPlayWav("SOUND45.WAV");
v20 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(10) == 12)
@@ -866,7 +866,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
}
case 50:
- _vm->_soundManager.playSound("SOUND46.WAv");
+ _vm->_soundManager.playSoundFile("SOUND46.WAv");
_vm->_objectsManager.OPTI_ONE(11, 0, 23, 0);
break;
@@ -920,7 +920,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.OPTI_ONE(15, 0, 12, 0);
_vm->_objectsManager.stopBobAnimation(15);
_vm->_objectsManager.OBSSEUL = true;
- _vm->_objectsManager.INILINK("IM19a");
+ _vm->_objectsManager.loadLinkFile("IM19a");
_vm->_objectsManager.OBSSEUL = false;
break;
@@ -977,13 +977,13 @@ int ScriptManager::handleOpcode(byte *dataP) {
return -1; // Exiting game
if (_vm->_objectsManager.getBobAnimDataIdx(7) == 10 && !v18) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v18 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(7) == 11)
v18 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(7) == 18 && !v18) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v18 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(7) == 19)
@@ -992,7 +992,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.setBobAnimation(3);
_vm->_eventsManager.VBL();
} while (_vm->_objectsManager.getBobAnimDataIdx(3) != 48);
- _vm->_soundManager.DEL_SAMPLE(1);
+ _vm->_soundManager.removeSample(1);
_vm->_objectsManager.setSpriteIndex(0, 62);
_vm->_objectsManager.animateSprite(0);
_vm->_objectsManager.setBobAnimation(6);
@@ -1047,7 +1047,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.stopBobAnimation(4);
_vm->_objectsManager.animateSprite(0);
_vm->_objectsManager.OBSSEUL = true;
- _vm->_objectsManager.INILINK("IM27a");
+ _vm->_objectsManager.loadLinkFile("IM27a");
_vm->_objectsManager.OBSSEUL = false;
break;
}
@@ -1139,7 +1139,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.stopBobAnimation(5);
_vm->_objectsManager.setBobAnimation(6);
_vm->_objectsManager.OBSSEUL = true;
- _vm->_objectsManager.INILINK("IM24a");
+ _vm->_objectsManager.loadLinkFile("IM24a");
_vm->_objectsManager.OBSSEUL = false;
break;
@@ -1173,25 +1173,25 @@ int ScriptManager::handleOpcode(byte *dataP) {
return -1; // Exiting game
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 1 && !v25) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v25 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 2)
v25 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 3 && !v25) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v25 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 4)
v25 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 5 && !v25) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v25 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 6)
v25 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 7 && !v25) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v25 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 8)
@@ -1201,7 +1201,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.stopBobAnimation(1);
_vm->_objectsManager.stopBobAnimation(2);
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 283, 160, 6);
- _vm->_soundManager.DEL_SAMPLE(1);
+ _vm->_soundManager.removeSample(1);
}
if (_vm->_globals._saveData->_data[svField183] == 2) {
_vm->_objectsManager.setBobAnimDataIdx(1, 0);
@@ -1215,25 +1215,25 @@ int ScriptManager::handleOpcode(byte *dataP) {
return -1; // Exiting game
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 1 && !v26) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v26 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 2)
v26 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 3 && !v26) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v26 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 4)
v26 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 5 && !v26) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v26 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 6)
v26 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 7 && !v26) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v26 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 8)
@@ -1243,12 +1243,12 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.stopBobAnimation(1);
_vm->_objectsManager.stopBobAnimation(3);
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 283, 161, 8);
- _vm->_soundManager.DEL_SAMPLE(1);
+ _vm->_soundManager.removeSample(1);
}
break;
case 90:
- _vm->_soundManager.playSound("SOUND52.WAV");
+ _vm->_soundManager.playSoundFile("SOUND52.WAV");
if (!_vm->_globals._saveData->_data[svField186]) {
_vm->_animationManager.playSequence("CIB5A.SEQ", 1, 12, 1);
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 155, 29, 0);
@@ -1261,7 +1261,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
break;
case 91:
- _vm->_soundManager.playSound("SOUND52.WAV");
+ _vm->_soundManager.playSoundFile("SOUND52.WAV");
if (!_vm->_globals._saveData->_data[svField186]) {
_vm->_animationManager.playSequence("CIB5B.SEQ", 1, 12, 1);
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 155, 29, 5);
@@ -1274,7 +1274,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
break;
case 92:
- _vm->_soundManager.playSound("SOUND52.WAV");
+ _vm->_soundManager.playSoundFile("SOUND52.WAV");
if (!_vm->_globals._saveData->_data[svField184]) {
_vm->_animationManager.playSequence("CIB6A.SEQ", 1, 12, 1);
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 155, 29, 0);
@@ -1287,7 +1287,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
break;
case 93:
- _vm->_soundManager.playSound("SOUND52.WAV");
+ _vm->_soundManager.playSoundFile("SOUND52.WAV");
if (!_vm->_globals._saveData->_data[svField184]) {
_vm->_animationManager.playSequence("CIB6B.SEQ", 1, 12, 1);
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 155, 29, 5);
@@ -1322,7 +1322,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
} while (_vm->_objectsManager.getBobAnimDataIdx(9) != 15);
_vm->_objectsManager.stopBobAnimation(9);
_vm->_objectsManager.animateSprite(0);
- _vm->_soundManager.playSound("SOUND50.WAV");
+ _vm->_soundManager.playSoundFile("SOUND50.WAV");
do {
if (_vm->shouldQuit())
return -1; // Exiting game
@@ -1403,19 +1403,19 @@ int ScriptManager::handleOpcode(byte *dataP) {
return -1; // Exiting game
if (_vm->_objectsManager.getBobAnimDataIdx(4) == 9 && !v33) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v33 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(4) == 10)
v33 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(4) == 32 && !v33) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v33 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(4) == 33)
v33 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(4) == 55 && !v33) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v33 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(4) == 56)
@@ -1432,19 +1432,19 @@ int ScriptManager::handleOpcode(byte *dataP) {
return -1; // Exiting game
if (_vm->_objectsManager.getBobAnimDataIdx(6) == 9 && !v34) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v34 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(6) == 10)
v34 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(6) == 32 && !v34) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v34 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(6) == 33)
v34 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(6) == 55 && !v34) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v34 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(6) == 56)
@@ -1461,19 +1461,19 @@ int ScriptManager::handleOpcode(byte *dataP) {
return -1; // Exiting game
if (_vm->_objectsManager.getBobAnimDataIdx(5) == 9 && !v35) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v35 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(5) == 10)
v35 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(5) == 32 && !v35) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v35 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(5) == 33)
v35 = 0;
if (_vm->_objectsManager.getBobAnimDataIdx(5) == 55 && !v35) {
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
v35 = 1;
}
if (_vm->_objectsManager.getBobAnimDataIdx(5) == 56)
@@ -1484,7 +1484,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
}
_vm->_objectsManager.animateSprite(0);
_vm->_objectsManager.doActionBack(1);
- _vm->_soundManager.DEL_SAMPLE(1);
+ _vm->_soundManager.removeSample(1);
break;
case 106:
@@ -1675,7 +1675,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.setBobAnimation(9);
_vm->_objectsManager.setBobAnimation(10);
_vm->_objectsManager.BOB_OFFSET(10, 300);
- _vm->_soundManager.playSound("SOUND44.WAV");
+ _vm->_soundManager.playSoundFile("SOUND44.WAV");
do {
if (_vm->shouldQuit())
return -1; // Exiting game
@@ -1690,7 +1690,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_eventsManager.VBL();
} while (_vm->_objectsManager.getBobAnimDataIdx(6) != 10);
- _vm->_soundManager.playSound("SOUND71.WAV");
+ _vm->_soundManager.playSoundFile("SOUND71.WAV");
_vm->_objectsManager.setBobAnimation(7);
_vm->_objectsManager.stopBobAnimation(4);
do {
@@ -1701,7 +1701,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
} while (_vm->_objectsManager.getBobAnimDataIdx(7) != 15);
_vm->_objectsManager.stopBobAnimation(5);
_vm->_objectsManager.setBobAnimation(8);
- _vm->_soundManager.playSound("SOUND70.WAV");
+ _vm->_soundManager.playSoundFile("SOUND70.WAV");
do {
if (_vm->shouldQuit())
return -1; // Exiting game
@@ -1867,7 +1867,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
} while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
_vm->_objectsManager.setSpriteIndex(0, 64);
_vm->_objectsManager.setBobAnimation(2);
- _vm->_soundManager.playSound("SOUND66.WAV");
+ _vm->_soundManager.playSoundFile("SOUND66.WAV");
do {
if (_vm->shouldQuit())
return -1; // Exiting game
@@ -1887,7 +1887,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 192, 152, 0);
_vm->_objectsManager.setBobAnimation(9);
_vm->_objectsManager.OBSSEUL = true;
- _vm->_objectsManager.INILINK("IM73a");
+ _vm->_objectsManager.loadLinkFile("IM73a");
_vm->_objectsManager.OBSSEUL = false;
_vm->_globals.CACHE_ON();
_vm->_animationManager.NO_SEQ = false;
@@ -1944,7 +1944,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
case 230: {
_vm->_objectsManager.OBSSEUL = true;
- _vm->_objectsManager.INILINK("IM93a");
+ _vm->_objectsManager.loadLinkFile("IM93a");
_vm->_objectsManager.OBSSEUL = false;
_vm->_globals.CACHE_ON();
_vm->_globals.NOT_VERIF = true;
@@ -1971,7 +1971,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
if (_vm->_objectsManager.getBobAnimDataIdx(7) == 9 && !v45) {
v45 = 1;
- _vm->_soundManager.playSound("SOUND81.WAV");
+ _vm->_soundManager.playSoundFile("SOUND81.WAV");
}
_vm->_eventsManager.VBL();
} while (_vm->_objectsManager.getBobAnimDataIdx(7) != 15);
@@ -1981,7 +1981,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.animateSprite(0);
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 337, 154, 3);
_vm->_objectsManager.OBSSEUL = true;
- _vm->_objectsManager.INILINK("IM93c");
+ _vm->_objectsManager.loadLinkFile("IM93c");
_vm->_objectsManager.OBSSEUL = false;
_vm->_globals.CACHE_ON();
break;
@@ -2052,7 +2052,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
vbobFrameIndex = 4;
else if (v47 == 1)
vbobFrameIndex = 6;
- _vm->_soundManager.playSound("SOUND83.WAV");
+ _vm->_soundManager.playSoundFile("SOUND83.WAV");
_vm->_objectsManager.OPTI_ONE(vbobFrameIndex, 26, 50, 0);
if (_vm->_globals._saveData->_data[svField341] == 1)
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 27, 117, 0);
@@ -2067,7 +2067,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
if (_vm->_globals._saveData->_data[svField341] == 3)
_vm->_globals._saveData->_data[svField340] = 0;
}
- _vm->_soundManager.playSound("SOUND83.WAV");
+ _vm->_soundManager.playSoundFile("SOUND83.WAV");
_vm->_objectsManager.OPTI_ONE(6, 0, 23, 0);
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 27, 117, 1);
break;
@@ -2082,7 +2082,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
vbobFrameIndex = 4;
if (v48 == 1)
vbobFrameIndex = 6;
- _vm->_soundManager.playSound("SOUND83.WAV");
+ _vm->_soundManager.playSoundFile("SOUND83.WAV");
_vm->_objectsManager.OPTI_ONE(vbobFrameIndex, 26, 50, 0);
if (_vm->_globals._saveData->_data[svField341] == 1)
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 27, 117, 0);
@@ -2097,7 +2097,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
if (_vm->_globals._saveData->_data[svField341] == 3)
_vm->_globals._saveData->_data[svField340] = 0;
}
- _vm->_soundManager.playSound("SOUND83.WAV");
+ _vm->_soundManager.playSoundFile("SOUND83.WAV");
_vm->_objectsManager.OPTI_ONE(5, 0, 23, 0);
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 145, 166, 3);
break;
@@ -2112,7 +2112,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
vbobFrameIndex = 4;
else if (v49 == 1)
vbobFrameIndex = 6;
- _vm->_soundManager.playSound("SOUND83.WAV");
+ _vm->_soundManager.playSoundFile("SOUND83.WAV");
_vm->_objectsManager.OPTI_ONE(vbobFrameIndex, 26, 50, 0);
if (_vm->_globals._saveData->_data[svField341] == 1)
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 27, 117, 0);
@@ -2127,7 +2127,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
if (_vm->_globals._saveData->_data[svField341] == 3)
_vm->_globals._saveData->_data[svField340] = 0;
}
- _vm->_soundManager.playSound("SOUND83.WAV");
+ _vm->_soundManager.playSoundFile("SOUND83.WAV");
_vm->_objectsManager.OPTI_ONE(4, 0, 23, 0);
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 296, 212, 5);
break;
@@ -2135,7 +2135,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
case 239:
_vm->_objectsManager.removeSprite(0);
- _vm->_soundManager.playSound("SOUND84.WAV");
+ _vm->_soundManager.playSoundFile("SOUND84.WAV");
_vm->_objectsManager.OPTI_ONE(16, 0, 10, 0);
break;
@@ -2148,13 +2148,13 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_eventsManager.VBL();
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 12 && !soundFlag) {
- _vm->_soundManager.playSound("SOUND86.WAV");
+ _vm->_soundManager.playSoundFile("SOUND86.WAV");
soundFlag = true;
}
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 13)
soundFlag = false;
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 25 && !soundFlag) {
- _vm->_soundManager.playSound("SOUND85.WAV");
+ _vm->_soundManager.playSoundFile("SOUND85.WAV");
soundFlag = true;
}
if (_vm->_objectsManager.getBobAnimDataIdx(1) == 25)
@@ -2193,7 +2193,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
// Resurrect Samantha's clone
case 242: {
- _vm->_soundManager.playSound("SOUND87.WAV");
+ _vm->_soundManager.playSoundFile("SOUND87.WAV");
_vm->_animationManager.NO_SEQ = true;
_vm->_animationManager.playSequence("RESUF.SEQ", 1, 24, 1);
_vm->_animationManager.NO_SEQ = false;
@@ -2217,7 +2217,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
}
case 243:
- _vm->_soundManager.playSound("SOUND88.WAV");
+ _vm->_soundManager.playSoundFile("SOUND88.WAV");
if (_vm->_globals._saveData->_data[svField341] == 2) {
_vm->_animationManager.NO_SEQ = true;
_vm->_animationManager.playSequence("RESU.SEQ", 2, 24, 2);
@@ -2228,7 +2228,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
break;
case 245:
- _vm->_soundManager.playSound("SOUND89.WAV");
+ _vm->_soundManager.playSoundFile("SOUND89.WAV");
_vm->_objectsManager.OPTI_ONE(5, 0, 6, 0);
_vm->_linesManager.ZONEP[4]._destX = 276;
_vm->_objectsManager.enableVerb(4, 19);
@@ -2261,7 +2261,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_graphicsManager.SETCOLOR3(253, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(251, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0);
- _vm->_graphicsManager.OPTI_INI("BOMBE", 2, true);
+ _vm->_graphicsManager.initScreen("BOMBE", 2, true);
_vm->_graphicsManager.fadeInShort();
break;
@@ -2403,7 +2403,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
int soundNum = READ_LE_INT16(dataP + 5);
Common::String file = Common::String::format("SOUND%d.WAV", soundNum);
- _vm->_soundManager.playSound(file);
+ _vm->_soundManager.playSoundFile(file);
opcodeType = 1;
break;
}
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 5d0442aaa5..5957cde960 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -282,25 +282,25 @@ void SoundManager::playAnimSound(int soundNumber) {
if (!_vm->_globals._censorshipFl && _specialSoundNum == 2) {
switch (soundNumber) {
case 20:
- PLAY_SAMPLE2(5);
+ playSample(5);
break;
case 57:
case 63:
case 69:
- PLAY_SAMPLE2(1);
+ playSample(1);
break;
case 75:
- PLAY_SAMPLE2(2);
+ playSample(2);
break;
case 109:
- PLAY_SAMPLE2(3);
+ playSample(3);
break;
case 122:
- PLAY_SAMPLE2(4);
+ playSample(4);
break;
}
} else if (_specialSoundNum == 1 && soundNumber == 17)
- playSound("SOUND42.WAV");
+ playSoundFile("SOUND42.WAV");
else if (_specialSoundNum == 5 && soundNumber == 19)
playWav(1);
else if (_specialSoundNum == 14 && soundNumber == 625)
@@ -309,11 +309,11 @@ void SoundManager::playAnimSound(int soundNumber) {
playWav(1);
else if (_specialSoundNum == 17) {
if (soundNumber == 6)
- PLAY_SAMPLE2(1);
+ playSample(1);
else if (soundNumber == 14)
- PLAY_SAMPLE2(2);
+ playSample(2);
else if (soundNumber == 67)
- PLAY_SAMPLE2(3);
+ playSample(3);
} else if (_specialSoundNum == 198 && soundNumber == 15)
playWav(1);
else if (_specialSoundNum == 199 && soundNumber == 72)
@@ -342,7 +342,7 @@ static const char *const modSounds[] = {
"tobac"
};
-void SoundManager::WSOUND(int soundNumber) {
+void SoundManager::playSound(int soundNumber) {
if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) {
if (soundNumber > 27)
return;
@@ -350,14 +350,14 @@ void SoundManager::WSOUND(int soundNumber) {
if (_oldSoundNumber != soundNumber || !_modPlayingFl) {
if (_modPlayingFl)
- WSOUND_OFF();
+ stopSound();
playMod(modSounds[soundNumber - 1]);
_oldSoundNumber = soundNumber;
}
}
-void SoundManager::WSOUND_OFF() {
+void SoundManager::stopSound() {
stopVoice(0);
stopVoice(1);
stopVoice(2);
@@ -618,7 +618,7 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode) {
return true;
}
-void SoundManager::DEL_SAMPLE(int soundIndex) {
+void SoundManager::removeSample(int soundIndex) {
if (checkVoiceStatus(1))
stopVoice(1);
if (checkVoiceStatus(2))
@@ -629,7 +629,7 @@ void SoundManager::DEL_SAMPLE(int soundIndex) {
_sound[soundIndex]._active = false;
}
-void SoundManager::playSound(const Common::String &file) {
+void SoundManager::playSoundFile(const Common::String &file) {
if (_soundOffFl)
return;
@@ -649,11 +649,12 @@ void SoundManager::playSound(const Common::String &file) {
playWav(1);
}
-void SoundManager::PLAY_SOUND2(const Common::String &file) {
- if (!_soundOffFl) {
- loadWav(file, 1);
- playWav(1);
- }
+void SoundManager::directPlayWav(const Common::String &file) {
+ if (_soundOffFl)
+ return;
+
+ loadWav(file, 1);
+ playWav(1);
}
void SoundManager::MODSetSampleVolume() {
@@ -683,36 +684,33 @@ void SoundManager::loadSample(int wavIndex, const Common::String &file) {
}
void SoundManager::playSample(int wavIndex, int voiceMode) {
- if (!_soundOffFl && _sound[wavIndex]._active) {
- if (_soundFl)
- delWav(_currentSoundIndex);
- if (voiceMode == 5) {
- if (checkVoiceStatus(1))
- stopVoice(1);
- PLAY_SAMPLE_SDL(1, wavIndex);
- } else if (voiceMode == 6) {
- if (checkVoiceStatus(2))
- stopVoice(1);
- PLAY_SAMPLE_SDL(2, wavIndex);
- } else if (voiceMode == 7) {
- if (checkVoiceStatus(3))
- stopVoice(1);
- PLAY_SAMPLE_SDL(3, wavIndex);
- } else if (voiceMode == 8) {
- if (checkVoiceStatus(1))
- stopVoice(1);
- PLAY_SAMPLE_SDL(1, wavIndex);
- }
- }
-}
+ if (_soundOffFl || !_sound[wavIndex]._active)
+ return;
-void SoundManager::PLAY_SAMPLE2(int idx) {
- if (!_soundOffFl && _sound[idx]._active) {
- if (_soundFl)
- delWav(_currentSoundIndex);
+ if (_soundFl)
+ delWav(_currentSoundIndex);
+
+ switch (voiceMode) {
+ case 5:
+ case 8:
+ // Case added to identify the former PLAY_SAMPLE2 calls
+ case 9:
if (checkVoiceStatus(1))
stopVoice(1);
- PLAY_SAMPLE_SDL(1, idx);
+ PLAY_SAMPLE_SDL(1, wavIndex);
+ break;
+ case 6:
+ if (checkVoiceStatus(2))
+ stopVoice(1);
+ PLAY_SAMPLE_SDL(2, wavIndex);
+ break;
+ case 7:
+ if (checkVoiceStatus(3))
+ stopVoice(1);
+ PLAY_SAMPLE_SDL(3, wavIndex);
+ break;
+ default:
+ break;
}
}
diff --git a/engines/hopkins/sound.h b/engines/hopkins/sound.h
index 70c05a83fc..c4db17c86a 100644
--- a/engines/hopkins/sound.h
+++ b/engines/hopkins/sound.h
@@ -114,11 +114,15 @@ public:
void playAnimSound(int soundNumber);
void loadSample(int wavIndex, const Common::String &file);
- void playSample(int wavIndex, int voiceMode);
+ void playSample(int wavIndex, int voiceMode = 9);
+ void removeSample(int soundIndex);
void checkSoundEnd();
void checkSounds();
- void playSound(const Common::String &file);
+ void playSoundFile(const Common::String &file);
+ void playSound(int soundNumber);
+ void stopSound();
+
void updateScummVMSoundSettings();
void syncSoundSettings();
bool mixVoice(int voiceId, int voiceMode);
@@ -129,12 +133,7 @@ public:
void loadWav(const Common::String &file, int wavIndex);
void playWav(int wavIndex);
-
- void DEL_SAMPLE(int soundIndex);
- void WSOUND(int soundNumber);
- void WSOUND_OFF();
- void PLAY_SOUND2(const Common::String &file2);
- void PLAY_SAMPLE2(int idx);
+ void directPlayWav(const Common::String &file2);
};
} // End of namespace Hopkins
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index f22aa679e1..c6d83ee8d3 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -875,7 +875,7 @@ void TalkManager::REPONSE2(int zone, int verb) {
_vm->_objectsManager.stopBobAnimation(3);
_vm->_objectsManager.stopBobAnimation(4);
_vm->_objectsManager.setBobAnimation(6);
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
_vm->_objectsManager.SPACTION1(_vm->_objectsManager._forestSprite, "13,14,15,14,13,12,13,14,15,16,-1,", 0, 0, 4);
do
_vm->_eventsManager.VBL();
@@ -923,7 +923,7 @@ void TalkManager::REPONSE2(int zone, int verb) {
_vm->_objectsManager.stopBobAnimation(1);
_vm->_objectsManager.stopBobAnimation(2);
_vm->_objectsManager.setBobAnimation(5);
- _vm->_soundManager.PLAY_SAMPLE2(1);
+ _vm->_soundManager.playSample(1);
_vm->_objectsManager.SPACTION1(_vm->_objectsManager._forestSprite, "13,14,15,14,13,12,13,14,15,16,-1,", 0, 0, 4);
do
_vm->_eventsManager.VBL();
@@ -1012,14 +1012,14 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
byte *oldAnswerBufferPtr = _vm->_globals._answerBuffer;
_vm->_globals._answerBuffer = g_PTRNUL;
_vm->_globals.NOMARCHE = true;
- _vm->_objectsManager.INILINK(screenFilename);
+ _vm->_objectsManager.loadLinkFile(screenFilename);
_vm->_objectsManager.PERSO_ON = true;
_vm->_globals.GOACTION = false;
_vm->_objectsManager._zoneNum = -1;
initCharacterAnim();
VISU_PARLE();
dialogWait();
- _vm->_graphicsManager.INI_ECRAN2(screenFilename, true);
+ _vm->_graphicsManager.initScreen(screenFilename, 2, true);
_vm->_globals.NOMARCHE = true;
_vm->_objectsManager._forceZoneFl = true;
_vm->_objectsManager._zoneNum = -1;
@@ -1052,8 +1052,8 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
_vm->_globals.freeMemory(_vm->_globals._answerBuffer);
_vm->_globals._answerBuffer = oldAnswerBufferPtr;
_vm->_objectsManager._disableFl = true;
- _vm->_objectsManager.INILINK(curScreenFilename);
- _vm->_graphicsManager.INI_ECRAN2(curScreenFilename, true);
+ _vm->_objectsManager.loadLinkFile(curScreenFilename);
+ _vm->_graphicsManager.initScreen(curScreenFilename, 2, true);
_vm->_objectsManager._disableFl = false;
_vm->_globals.NOMARCHE = false;
if (_vm->_globals._exitId == 101)
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 21:31:30 +0000