aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/hopkins/anim.cpp54
-rw-r--r--engines/hopkins/dialogs.cpp16
-rw-r--r--engines/hopkins/events.cpp40
-rw-r--r--engines/hopkins/graphics.cpp14
-rw-r--r--engines/hopkins/graphics.h7
-rw-r--r--engines/hopkins/hopkins.cpp50
-rw-r--r--engines/hopkins/objects.cpp44
-rw-r--r--engines/hopkins/script.cpp68
-rw-r--r--engines/hopkins/sound.cpp219
-rw-r--r--engines/hopkins/sound.h24
-rw-r--r--engines/hopkins/talk.cpp71
-rw-r--r--engines/hopkins/talk.h4
12 files changed, 289 insertions, 322 deletions
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index 25c6913a72..e6e9985fcc 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -102,7 +102,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
}
_vm->_eventsManager._rateCounter = 0;
_vm->_eventsManager._escKeyFl = false;
- _vm->_soundManager.LOAD_ANM_SOUND();
+ _vm->_soundManager.loadAnimSound();
if (_vm->_globals.iRegul == 1) {
// Do pre-animation delay
@@ -118,7 +118,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
frameNumber = 0;
while (!_vm->shouldQuit()) {
++frameNumber;
- _vm->_soundManager.playAnim_SOUND(frameNumber);
+ _vm->_soundManager.playAnimSound(frameNumber);
// Read frame header
if (f.read(ptr, 16) != 16)
@@ -135,7 +135,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
goto EXIT;
_vm->_eventsManager.refreshEvents();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
} while (!_vm->shouldQuit() && _vm->_eventsManager._rateCounter < rate2);
}
@@ -151,7 +151,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
}
_vm->_graphicsManager.unlockScreen();
_vm->_graphicsManager.DD_VBL();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
}
if (_vm->_globals.iRegul == 1) {
@@ -161,12 +161,12 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
break;
_vm->_eventsManager.refreshEvents();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
} while (_vm->_eventsManager._rateCounter < rate3);
}
_vm->_eventsManager._rateCounter = 0;
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
EXIT:
if (_vm->_graphicsManager.FADE_LINUX == 2 && !hasScreenCopy) {
screenCopy = _vm->_globals.allocMemory(307200);
@@ -256,7 +256,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 a2, uint
f.read(screenP, nbytes);
_vm->_graphicsManager.clearPalette();
- oldScrollVal = _vm->_graphicsManager.SCROLL;
+ oldScrollVal = _vm->_graphicsManager._scrollPosX;
_vm->_graphicsManager.SCANLINE(SCREEN_WIDTH);
_vm->_graphicsManager.scrollScreen(0);
_vm->_graphicsManager.lockScreen();
@@ -284,7 +284,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 a2, uint
}
_vm->_eventsManager._rateCounter = 0;
_vm->_eventsManager._escKeyFl = false;
- _vm->_soundManager.LOAD_ANM_SOUND();
+ _vm->_soundManager.loadAnimSound();
if (_vm->_globals.iRegul != 1)
break;
for (;;) {
@@ -309,7 +309,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 a2, uint
_vm->_graphicsManager.lockScreen();
_vm->_graphicsManager.clearScreen();
_vm->_graphicsManager.unlockScreen();
- _vm->_graphicsManager.SCROLL = oldScrollVal;
+ _vm->_graphicsManager._scrollPosX = oldScrollVal;
_vm->_graphicsManager.scrollScreen(oldScrollVal);
if (_vm->_graphicsManager._largeScreenFl) {
_vm->_graphicsManager.SCANLINE(1280);
@@ -333,7 +333,7 @@ LABEL_48:
frameNumber = 0;
for (;;) {
++frameNumber;
- _vm->_soundManager.playAnim_SOUND(frameNumber);
+ _vm->_soundManager.playAnimSound(frameNumber);
memset(&buf, 0, 6);
memset(ptr, 0, 19);
@@ -361,13 +361,13 @@ LABEL_77:
}
_vm->_graphicsManager.unlockScreen();
_vm->_graphicsManager.DD_VBL();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
LABEL_88:
if (v5 == -1) {
if (_vm->_globals.iRegul == 1) {
while (!_vm->_eventsManager._escKeyFl) {
_vm->_eventsManager.refreshEvents();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
if (_vm->_eventsManager._rateCounter >= a4)
goto LABEL_114;
}
@@ -377,7 +377,7 @@ LABEL_88:
}
while (!_vm->_eventsManager._escKeyFl) {
_vm->_eventsManager.refreshEvents();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
if (_vm->_eventsManager._rateCounter >= a3)
goto LABEL_77;
}
@@ -439,7 +439,7 @@ LABEL_114:
_vm->_graphicsManager.lockScreen();
_vm->_graphicsManager.clearScreen();
_vm->_graphicsManager.unlockScreen();
- _vm->_graphicsManager.SCROLL = oldScrollVal;
+ _vm->_graphicsManager._scrollPosX = oldScrollVal;
_vm->_graphicsManager.scrollScreen(oldScrollVal);
if (_vm->_graphicsManager._largeScreenFl) {
_vm->_graphicsManager.SCANLINE(1280);
@@ -756,7 +756,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
if (_vm->getIsDemo()) {
_vm->_eventsManager._rateCounter = 0;
_vm->_eventsManager._escKeyFl = false;
- _vm->_soundManager.LOAD_ANM_SOUND();
+ _vm->_soundManager.loadAnimSound();
if (_vm->_globals.iRegul == 1) {
do {
if (_vm->_eventsManager._escKeyFl) {
@@ -765,7 +765,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
_vm->_eventsManager._escKeyFl = false;
}
_vm->_eventsManager.refreshEvents();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
} while (_vm->_eventsManager._rateCounter < rate1);
}
} else {
@@ -773,7 +773,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
_vm->_graphicsManager.fadeInDefaultLength(screenP);
_vm->_eventsManager._rateCounter = 0;
_vm->_eventsManager._escKeyFl = false;
- _vm->_soundManager.LOAD_ANM_SOUND();
+ _vm->_soundManager.loadAnimSound();
if (_vm->_globals.iRegul == 1) {
do {
if (_vm->_eventsManager._escKeyFl) {
@@ -782,7 +782,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
_vm->_eventsManager._escKeyFl = false;
}
_vm->_eventsManager.refreshEvents();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
} while (_vm->_eventsManager._rateCounter < rate1);
}
}
@@ -791,7 +791,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
soundNumber = 0;
do {
++soundNumber;
- _vm->_soundManager.playAnim_SOUND(soundNumber);
+ _vm->_soundManager.playAnimSound(soundNumber);
memset(v10, 0, 19);
if (f.read(v10, 16) != 16)
readError = true;
@@ -808,7 +808,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
_vm->_eventsManager._escKeyFl = false;
}
_vm->_eventsManager.refreshEvents();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
} while (_vm->_eventsManager._rateCounter < rate2);
}
_vm->_eventsManager._rateCounter = 0;
@@ -823,7 +823,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
}
_vm->_graphicsManager.unlockScreen();
_vm->_graphicsManager.DD_VBL();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
}
} while (!readError);
@@ -835,7 +835,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
_vm->_eventsManager._escKeyFl = false;
}
_vm->_eventsManager.refreshEvents();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
} while (_vm->_eventsManager._rateCounter < rate3);
}
_vm->_eventsManager._rateCounter = 0;
@@ -913,14 +913,14 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u
}
_vm->_eventsManager._rateCounter = 0;
_vm->_eventsManager._escKeyFl = false;
- _vm->_soundManager.LOAD_ANM_SOUND();
+ _vm->_soundManager.loadAnimSound();
if (_vm->_globals.iRegul != 1)
break;
while (!_vm->shouldQuit()) {
if (_vm->_eventsManager._escKeyFl)
goto LABEL_54;
_vm->_eventsManager.refreshEvents();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
if (_vm->_eventsManager._rateCounter >= rate1)
goto LABEL_23;
}
@@ -936,7 +936,7 @@ LABEL_23:
v4 = false;
v13 = 0;
while (!_vm->shouldQuit()) {
- _vm->_soundManager.playAnim_SOUND(v13++);
+ _vm->_soundManager.playAnimSound(v13++);
memset(v11, 0, 19);
if (f.read(v11, 16) != 16)
@@ -962,13 +962,13 @@ LABEL_33:
}
_vm->_graphicsManager.unlockScreen();
_vm->_graphicsManager.DD_VBL();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
LABEL_44:
if (v4) {
if (_vm->_globals.iRegul == 1) {
while (!_vm->_eventsManager._escKeyFl) {
_vm->_eventsManager.refreshEvents();
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
if (_vm->_eventsManager._rateCounter >= rate3) {
_vm->_eventsManager._rateCounter = 0;
break;
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
index b06d2707c5..a082cf172e 100644
--- a/engines/hopkins/dialogs.cpp
+++ b/engines/hopkins/dialogs.cpp
@@ -299,7 +299,7 @@ void DialogsManager::showInventory() {
if (_removeInventFl || _inventDisplayedFl || _vm->_globals._disableInventFl)
return;
- _vm->_graphicsManager.no_scroll = 1;
+ _vm->_graphicsManager._scrollStatus = 1;
_vm->_objectsManager.FLAG_VISIBLE_EFFACE = 4;
_vm->_objectsManager._visibleFl = false;
for (int i = 0; i <= 1; i++) {
@@ -454,7 +454,7 @@ LABEL_7:
_vm->_objectsManager._oldBorderPos = Common::Point(0, 0);
_vm->_objectsManager._borderPos = Common::Point(0, 0);
_vm->_globals._disableInventFl = false;
- _vm->_graphicsManager.no_scroll = 0;
+ _vm->_graphicsManager._scrollStatus = 0;
}
/**
@@ -523,19 +523,19 @@ void DialogsManager::testDialogOpening() {
_vm->_dialogsManager.showInventory();
break;
case KEY_OPTIONS:
- _vm->_graphicsManager.no_scroll = 1;
+ _vm->_graphicsManager._scrollStatus = 1;
_vm->_dialogsManager.showOptionsDialog();
- _vm->_graphicsManager.no_scroll = 0;
+ _vm->_graphicsManager._scrollStatus = 0;
break;
case KEY_LOAD:
- _vm->_graphicsManager.no_scroll = 1;
+ _vm->_graphicsManager._scrollStatus = 1;
_vm->_dialogsManager.showLoadGame();
- _vm->_graphicsManager.no_scroll = 0;
+ _vm->_graphicsManager._scrollStatus = 0;
break;
case KEY_SAVE:
- _vm->_graphicsManager.no_scroll = 1;
+ _vm->_graphicsManager._scrollStatus = 1;
_vm->_dialogsManager.showSaveGame();
- _vm->_graphicsManager.no_scroll = 0;
+ _vm->_graphicsManager._scrollStatus = 0;
break;
default:
break;
diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
index 1b4e02a386..d2c0689f0a 100644
--- a/engines/hopkins/events.cpp
+++ b/engines/hopkins/events.cpp
@@ -389,7 +389,7 @@ LABEL_45:
}
}
goto LABEL_54;
- }
+ }
_vm->_eventsManager.updateCursor();
_vm->_graphicsManager.addVesaSegment(v15, yp, v12, v11);
@@ -418,25 +418,25 @@ LABEL_63:
LABEL_65:
_vm->_globals._speed = 2;
_rateCounter = 0;
- if (!_vm->_graphicsManager._largeScreenFl || _vm->_graphicsManager.no_scroll == 1) {
+ if (!_vm->_graphicsManager._largeScreenFl || _vm->_graphicsManager._scrollStatus == 1) {
_vm->_graphicsManager.displayVesaSegment();
} else {
- if (_vm->_graphicsManager.no_scroll != 2) {
- if (getMouseX() > _vm->_graphicsManager.SCROLL + 620)
- _vm->_graphicsManager.SCROLL += _vm->_graphicsManager._scrollSpeed;
- if (getMouseX() < _vm->_graphicsManager.SCROLL + 10)
- _vm->_graphicsManager.SCROLL -= _vm->_graphicsManager._scrollSpeed;
+ if (_vm->_graphicsManager._scrollStatus != 2) {
+ if (getMouseX() > _vm->_graphicsManager._scrollPosX + 620)
+ _vm->_graphicsManager._scrollPosX += _vm->_graphicsManager._scrollSpeed;
+ if (getMouseX() < _vm->_graphicsManager._scrollPosX + 10)
+ _vm->_graphicsManager._scrollPosX -= _vm->_graphicsManager._scrollSpeed;
}
- if (_vm->_graphicsManager.SCROLL < 0)
- _vm->_graphicsManager.SCROLL = 0;
- if (_vm->_graphicsManager.SCROLL > SCREEN_WIDTH)
- _vm->_graphicsManager.SCROLL = SCREEN_WIDTH;
- if (_vm->_graphicsManager.OLD_SCROLL == _vm->_graphicsManager.SCROLL) {
+ if (_vm->_graphicsManager._scrollPosX < 0)
+ _vm->_graphicsManager._scrollPosX = 0;
+ if (_vm->_graphicsManager._scrollPosX > SCREEN_WIDTH)
+ _vm->_graphicsManager._scrollPosX = SCREEN_WIDTH;
+ if (_vm->_graphicsManager._oldScrollPosX == _vm->_graphicsManager._scrollPosX) {
_vm->_graphicsManager.displayVesaSegment();
} else {
_vm->_fontManager.hideText(9);
_vm->_graphicsManager.lockScreen();
- _vm->_graphicsManager.m_scroll16(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager.SCROLL, 20, SCREEN_WIDTH, 440, 0, 20);
+ _vm->_graphicsManager.m_scroll16(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager._scrollPosX, 20, SCREEN_WIDTH, 440, 0, 20);
_vm->_graphicsManager.unlockScreen();
_vm->_graphicsManager.dstrect[0] = Common::Rect(0, 20, SCREEN_WIDTH, 460);
@@ -446,17 +446,17 @@ LABEL_65:
}
_vm->_globals.NBBLOC = 0;
- _startPos.x = _vm->_graphicsManager.SCROLL;
- _vm->_graphicsManager._scrollOffset = _vm->_graphicsManager.SCROLL;
- _vm->_graphicsManager.SCROLL = _vm->_graphicsManager.SCROLL;
+ _startPos.x = _vm->_graphicsManager._scrollPosX;
+ _vm->_graphicsManager._scrollOffset = _vm->_graphicsManager._scrollPosX;
+ _vm->_graphicsManager._scrollPosX = _vm->_graphicsManager._scrollPosX;
}
- _vm->_graphicsManager.OLD_SCROLL = _vm->_graphicsManager.SCROLL;
- _startPos.x = _vm->_graphicsManager.SCROLL;
- _vm->_graphicsManager._scrollOffset = _vm->_graphicsManager.SCROLL;
+ _vm->_graphicsManager._oldScrollPosX = _vm->_graphicsManager._scrollPosX;
+ _startPos.x = _vm->_graphicsManager._scrollPosX;
+ _vm->_graphicsManager._scrollOffset = _vm->_graphicsManager._scrollPosX;
}
_curMouseButton = _mouseButton;
_mouseButton = 0;
- _vm->_soundManager.VERIF_SOUND();
+ _vm->_soundManager.checkSoundEnd();
refreshEvents();
}
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index 7f6d7223a7..3ad8d95061 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -42,9 +42,9 @@ GraphicsManager::GraphicsManager() {
_lineNbr = 0;
_videoPtr = NULL;
_scrollOffset = 0;
- SCROLL = 0;
+ _scrollPosX = 0;
_largeScreenFl = false;
- OLD_SCROLL = 0;
+ _oldScrollPosX = 0;
_lineNbr2 = 0;
Agr_x = Agr_y = 0;
@@ -52,7 +52,7 @@ GraphicsManager::GraphicsManager() {
_fadeDefaultSpeed = 15;
FADE_LINUX = 0;
_skipVideoLockFl = false;
- no_scroll = 0;
+ _scrollStatus = 0;
min_x = 0;
min_y = 20;
max_x = SCREEN_WIDTH * 2;
@@ -82,7 +82,7 @@ void GraphicsManager::setParent(HopkinsEngine *vm) {
if (_vm->getIsDemo()) {
if (_vm->getPlatform() == Common::kPlatformLinux)
- // CHECKME: Should be 0?
+ // CHECKME: Should be false?
MANU_SCROLL = true;
else
MANU_SCROLL = false;
@@ -194,8 +194,8 @@ void GraphicsManager::loadScreen(const Common::String &file) {
scrollScreen(0);
A_PCX640_480(_vesaScreen, file, _palette, flag);
- SCROLL = 0;
- OLD_SCROLL = 0;
+ _scrollPosX = 0;
+ _oldScrollPosX = 0;
clearPalette();
if (!_largeScreenFl) {
@@ -246,7 +246,7 @@ void GraphicsManager::scrollScreen(int amount) {
int result = CLIP(amount, 0, SCREEN_WIDTH);
_vm->_eventsManager._startPos.x = result;
_scrollOffset = result;
- SCROLL = result;
+ _scrollPosX = result;
}
void GraphicsManager::Trans_bloc(byte *destP, const byte *srcP, int count, int minThreshold, int maxThreshold) {
diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h
index 8ff4a7c13e..264a3fad80 100644
--- a/engines/hopkins/graphics.h
+++ b/engines/hopkins/graphics.h
@@ -68,10 +68,9 @@ public:
byte *_vesaScreen;
byte *_vesaBuffer;
int _scrollOffset;
- int SCROLL;
- byte HEADER_PCX[128];
+ int _scrollPosX;
bool _largeScreenFl;
- int OLD_SCROLL;
+ int _oldScrollPosX;
bool MANU_SCROLL;
int _scrollSpeed;
int _lineNbr2;
@@ -80,7 +79,7 @@ public:
int _fadeDefaultSpeed;
int FADE_LINUX;
bool _skipVideoLockFl;
- int no_scroll;
+ int _scrollStatus;
Common::Rect dstrect[50];
int min_x, min_y;
int max_x, max_y;
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 34b410cf05..3a7e4d4520 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -228,7 +228,7 @@ bool HopkinsEngine::runWin95Demo() {
_eventsManager.delay(500);
_graphicsManager.fadeOutLong();
_globals.iRegul = 1;
- _soundManager.SPECIAL_SOUND = 2;
+ _soundManager._specialSoundNum = 2;
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
_graphicsManager.unlockScreen();
@@ -237,7 +237,7 @@ bool HopkinsEngine::runWin95Demo() {
_animationManager.playAnim("BANQUE.ANM", 200, 28, 200);
else
_animationManager.playAnim("BANKUK.ANM", 200, 28, 200);
- _soundManager.SPECIAL_SOUND = 0;
+ _soundManager._specialSoundNum = 0;
_soundManager.DEL_SAMPLE(1);
_soundManager.DEL_SAMPLE(2);
_soundManager.DEL_SAMPLE(3);
@@ -541,7 +541,7 @@ bool HopkinsEngine::runLinuxDemo() {
_eventsManager.delay(500);
_graphicsManager.fadeOutLong();
_globals.iRegul = 1;
- _soundManager.SPECIAL_SOUND = 2;
+ _soundManager._specialSoundNum = 2;
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
@@ -553,7 +553,7 @@ bool HopkinsEngine::runLinuxDemo() {
_animationManager.playAnim("BANQUE.ANM", 200, 28, 200);
else
_animationManager.playAnim("BANKUK.ANM", 200, 28, 200);
- _soundManager.SPECIAL_SOUND = 0;
+ _soundManager._specialSoundNum = 0;
_soundManager.DEL_SAMPLE(1);
_soundManager.DEL_SAMPLE(2);
_soundManager.DEL_SAMPLE(3);
@@ -882,7 +882,7 @@ bool HopkinsEngine::runFull() {
_eventsManager.delay(500);
_graphicsManager.fadeOutLong();
_globals.iRegul = 1;
- _soundManager.SPECIAL_SOUND = 2;
+ _soundManager._specialSoundNum = 2;
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
_graphicsManager.unlockScreen();
@@ -897,7 +897,7 @@ bool HopkinsEngine::runFull() {
} else {
_animationManager.playAnim("BANQUE.ANM", 200, 12, 200);
}
- _soundManager.SPECIAL_SOUND = 0;
+ _soundManager._specialSoundNum = 0;
_soundManager.DEL_SAMPLE(1);
_soundManager.DEL_SAMPLE(2);
_soundManager.DEL_SAMPLE(3);
@@ -1763,24 +1763,24 @@ void HopkinsEngine::playIntro() {
_globals.iRegul = 1;
_graphicsManager.fadeInLong();
if (_graphicsManager._largeScreenFl) {
- _graphicsManager.no_scroll = 2;
+ _graphicsManager._scrollStatus = 2;
bool v3 = false;
- _graphicsManager.SCROLL = 0;
+ _graphicsManager._scrollPosX = 0;
do {
- _graphicsManager.SCROLL += 2;
- if (_graphicsManager.SCROLL > (SCREEN_WIDTH - 2)) {
- _graphicsManager.SCROLL = SCREEN_WIDTH;
+ _graphicsManager._scrollPosX += 2;
+ if (_graphicsManager._scrollPosX > (SCREEN_WIDTH - 2)) {
+ _graphicsManager._scrollPosX = SCREEN_WIDTH;
v3 = true;
}
- if (_eventsManager.getMouseX() < _graphicsManager.SCROLL + 10)
+ if (_eventsManager.getMouseX() < _graphicsManager._scrollPosX + 10)
_eventsManager.setMouseXY(_eventsManager._mousePos.x + 4, _eventsManager.getMouseY());
_eventsManager.VBL();
- } while (!shouldQuit() && !v3 && _graphicsManager.SCROLL != SCREEN_WIDTH);
+ } while (!shouldQuit() && !v3 && _graphicsManager._scrollPosX != SCREEN_WIDTH);
_eventsManager.VBL();
- _graphicsManager.no_scroll = 0;
+ _graphicsManager._scrollStatus = 0;
if (shouldQuit())
return;
@@ -1788,7 +1788,7 @@ void HopkinsEngine::playIntro() {
_soundManager.mixVoice(4, 3);
_graphicsManager.fadeOutLong();
- _graphicsManager.no_scroll = 0;
+ _graphicsManager._scrollStatus = 0;
_graphicsManager.loadImage("intro2");
_graphicsManager.scrollScreen(0);
_animationManager.loadAnim("INTRO2");
@@ -1822,13 +1822,13 @@ void HopkinsEngine::playIntro() {
if (shouldQuit())
return;
- _soundManager.SPECIAL_SOUND = 5;
+ _soundManager._specialSoundNum = 5;
_graphicsManager.FADE_LINUX = 2;
_animationManager.playAnim("ELEC.ANM", 10, 26, 200);
if (shouldQuit())
return;
- _soundManager.SPECIAL_SOUND = 0;
+ _soundManager._specialSoundNum = 0;
if (!_eventsManager._escKeyFl) {
_graphicsManager.loadImage("intro2");
@@ -1917,12 +1917,12 @@ void HopkinsEngine::playIntro() {
_graphicsManager.FIN_VISU();
_animationManager._clearAnimationFl = true;
_soundManager.WSOUND(3);
- _soundManager.SPECIAL_SOUND = 1;
+ _soundManager._specialSoundNum = 1;
_animationManager.playAnim("INTRO1.anm", 10, 24, 18);
if (shouldQuit())
return;
- _soundManager.SPECIAL_SOUND = 0;
+ _soundManager._specialSoundNum = 0;
if (!_eventsManager._escKeyFl) {
_animationManager.playAnim("INTRO2.anm", 10, 24, 18);
@@ -2003,10 +2003,10 @@ void HopkinsEngine::bombExplosion() {
_graphicsManager.clearPalette();
_globals.iRegul = 1;
- _soundManager.SPECIAL_SOUND = 199;
+ _soundManager._specialSoundNum = 199;
_graphicsManager.FADE_LINUX = 2;
_animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500);
- _soundManager.SPECIAL_SOUND = 0;
+ _soundManager._specialSoundNum = 0;
_graphicsManager.loadImage("IM15");
_animationManager.loadAnim("ANIM15");
_graphicsManager.VISU_ALL();
@@ -2260,7 +2260,7 @@ void HopkinsEngine::playEnding() {
_objectsManager.stopBobAnimation(7);
if (_globals._saveData->data[svField135] == 1) {
- _soundManager.SPECIAL_SOUND = 200;
+ _soundManager._specialSoundNum = 200;
_soundManager.VBL_MERDE = true;
_graphicsManager.FADE_LINUX = 2;
_animationManager.playAnim("BERM.ANM", 100, 24, 300);
@@ -2278,7 +2278,7 @@ void HopkinsEngine::playEnding() {
_eventsManager._escKeyFl = false;
_graphicsManager.fadeOutLong();
_globals.iRegul = 1;
- _soundManager.SPECIAL_SOUND = 0;
+ _soundManager._specialSoundNum = 0;
_graphicsManager.FADE_LINUX = 2;
_animationManager.playAnim("JOUR2A.anm", 12, 12, 1000);
_soundManager.WSOUND(11);
@@ -2297,7 +2297,7 @@ void HopkinsEngine::playEnding() {
_dialogsManager._removeInventFl = false;
_globals._disableInventFl = false;
} else {
- _soundManager.SPECIAL_SOUND = 200;
+ _soundManager._specialSoundNum = 200;
_soundManager.VBL_MERDE = true;
_animationManager.playAnim2("BERM.ANM", 100, 24, 300);
_objectsManager.stopBobAnimation(7);
@@ -2321,7 +2321,7 @@ void HopkinsEngine::playEnding() {
_soundManager.DEL_SAMPLE(1);
_soundManager.WSOUND(16);
_globals.iRegul = 1;
- _soundManager.SPECIAL_SOUND = 0;
+ _soundManager._specialSoundNum = 0;
_dialogsManager._removeInventFl = false;
_globals._disableInventFl = false;
_animationManager.playAnim("JOUR4A.anm", 12, 12, 1000);
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index d290c4a45a..36e124e14c 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -2294,20 +2294,20 @@ void ObjectsManager::PARADISE() {
_vm->_fontManager.hideText(5);
if (!_vm->_globals._forestFl || _zoneNum < 20 || _zoneNum > 23) {
if (_vm->_graphicsManager._largeScreenFl) {
- _vm->_graphicsManager.no_scroll = 2;
+ _vm->_graphicsManager._scrollStatus = 2;
if (_vm->_eventsManager._startPos.x + 320 - getSpriteX(0) > 160) {
bool loopCond = false;
do {
- _vm->_graphicsManager.SCROLL -= _vm->_graphicsManager._scrollSpeed;
- if (_vm->_graphicsManager.SCROLL < 0) {
- _vm->_graphicsManager.SCROLL = 0;
+ _vm->_graphicsManager._scrollPosX -= _vm->_graphicsManager._scrollSpeed;
+ if (_vm->_graphicsManager._scrollPosX < 0) {
+ _vm->_graphicsManager._scrollPosX = 0;
loopCond = true;
}
- if (_vm->_graphicsManager.SCROLL > SCREEN_WIDTH) {
- _vm->_graphicsManager.SCROLL = SCREEN_WIDTH;
+ if (_vm->_graphicsManager._scrollPosX > SCREEN_WIDTH) {
+ _vm->_graphicsManager._scrollPosX = SCREEN_WIDTH;
loopCond = true;
}
- if (_vm->_eventsManager.getMouseX() > _vm->_graphicsManager.SCROLL + 620)
+ if (_vm->_eventsManager.getMouseX() > _vm->_graphicsManager._scrollPosX + 620)
_vm->_eventsManager.setMouseXY(_vm->_eventsManager._mousePos.x - 4, _vm->_eventsManager.getMouseY());
_vm->_eventsManager.VBL();
@@ -2315,27 +2315,27 @@ void ObjectsManager::PARADISE() {
} else if (_vm->_eventsManager._startPos.x + 320 - getSpriteX(0) < -160) {
bool loopCond = false;
do {
- _vm->_graphicsManager.SCROLL += _vm->_graphicsManager._scrollSpeed;
- if (_vm->_graphicsManager.SCROLL < 0) {
- _vm->_graphicsManager.SCROLL = 0;
+ _vm->_graphicsManager._scrollPosX += _vm->_graphicsManager._scrollSpeed;
+ if (_vm->_graphicsManager._scrollPosX < 0) {
+ _vm->_graphicsManager._scrollPosX = 0;
loopCond = true;
}
- if (_vm->_graphicsManager.SCROLL > SCREEN_WIDTH) {
- _vm->_graphicsManager.SCROLL = SCREEN_WIDTH;
+ if (_vm->_graphicsManager._scrollPosX > SCREEN_WIDTH) {
+ _vm->_graphicsManager._scrollPosX = SCREEN_WIDTH;
loopCond = true;
}
- if (_vm->_eventsManager.getMouseX() < _vm->_graphicsManager.SCROLL + 10)
+ if (_vm->_eventsManager.getMouseX() < _vm->_graphicsManager._scrollPosX + 10)
_vm->_eventsManager.setMouseXY(_vm->_eventsManager._mousePos.x + 4, _vm->_eventsManager.getMouseY());
_vm->_eventsManager.VBL();
} while (!loopCond && _vm->_eventsManager._startPos.x < getSpriteX(0) - 320);
}
- if (_vm->_eventsManager.getMouseX() > _vm->_graphicsManager.SCROLL + 620)
- _vm->_eventsManager.setMouseXY(_vm->_graphicsManager.SCROLL + 610, 0);
- if (_vm->_eventsManager.getMouseX() < _vm->_graphicsManager.SCROLL + 10)
- _vm->_eventsManager.setMouseXY(_vm->_graphicsManager.SCROLL + 10, 0);
+ if (_vm->_eventsManager.getMouseX() > _vm->_graphicsManager._scrollPosX + 620)
+ _vm->_eventsManager.setMouseXY(_vm->_graphicsManager._scrollPosX + 610, 0);
+ if (_vm->_eventsManager.getMouseX() < _vm->_graphicsManager._scrollPosX + 10)
+ _vm->_eventsManager.setMouseXY(_vm->_graphicsManager._scrollPosX + 10, 0);
_vm->_eventsManager.VBL();
- _vm->_graphicsManager.no_scroll = 0;
+ _vm->_graphicsManager._scrollStatus = 0;
}
_vm->_talkManager.REPONSE(_vm->_globals._saveData->data[svField2], _vm->_globals._saveData->data[svField1]);
} else {
@@ -3317,13 +3317,13 @@ void ObjectsManager::handleSpecialGames() {
if (!_vm->_graphicsManager._lineNbr)
_vm->_graphicsManager._scrollOffset = 0;
_vm->_graphicsManager.NB_SCREEN(true);
- _vm->_soundManager.SPECIAL_SOUND = 198;
+ _vm->_soundManager._specialSoundNum = 198;
PERSO_ON = true;
_vm->_animationManager.NO_SEQ = true;
_vm->_animationManager._clearAnimationFl = false;
_vm->_animationManager.playAnim("otage.ANM", 1, 24, 500);
_vm->_animationManager.NO_SEQ = false;
- _vm->_soundManager.SPECIAL_SOUND = 0;
+ _vm->_soundManager._specialSoundNum = 0;
_vm->_graphicsManager.NB_SCREEN(false);
_vm->_saveLoadManager.load("TEMP1.SCR", _vm->_graphicsManager._vesaScreen);
@@ -3338,7 +3338,7 @@ void ObjectsManager::handleSpecialGames() {
_vm->_graphicsManager.unlockScreen();
memcpy(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager._vesaScreen, 614399);
- _vm->_graphicsManager.no_scroll = 0;
+ _vm->_graphicsManager._scrollStatus = 0;
_vm->_graphicsManager.DD_VBL();
break;
case 20:
@@ -4596,7 +4596,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm
}
_vm->_eventsManager.setMouseXY(_characterPos);
if (_vm->_graphicsManager._largeScreenFl)
- _vm->_graphicsManager.SCROLL = (int16)getSpriteX(0) - 320;
+ _vm->_graphicsManager._scrollPosX = (int16)getSpriteX(0) - 320;
computeAndSetSpriteSize();
animateSprite(0);
_vm->_globals.CACHE_ON();
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index aa478f2d6d..58d6decb7b 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -556,10 +556,10 @@ int ScriptManager::handleOpcode(byte *dataP) {
// If uncensored, rip the throat of the hostage
if (!_vm->_globals._censorshipFl) {
- _vm->_soundManager.SPECIAL_SOUND = 16;
+ _vm->_soundManager._specialSoundNum = 16;
_vm->_graphicsManager.FADE_LINUX = 2;
_vm->_animationManager.playAnim("EGORGE.ANM", 50, 28, 500);
- _vm->_soundManager.SPECIAL_SOUND = 0;
+ _vm->_soundManager._specialSoundNum = 0;
}
_vm->_animationManager.loadAnim("ASCEN");
_vm->_eventsManager.mouseOff();
@@ -582,10 +582,10 @@ int ScriptManager::handleOpcode(byte *dataP) {
if ((_vm->getPlatform() == Common::kPlatformWindows) && _vm->getIsDemo())
_vm->_soundManager.playSound("SOUND17.WAV");
- _vm->_soundManager.SPECIAL_SOUND = 14;
+ _vm->_soundManager._specialSoundNum = 14;
_vm->_graphicsManager.FADE_LINUX = 2;
_vm->_animationManager.playSequence2("ASSOM.SEQ", 10, 4, 500);
- _vm->_soundManager.SPECIAL_SOUND = 0;
+ _vm->_soundManager._specialSoundNum = 0;
if ((_vm->getPlatform() == Common::kPlatformWindows) && _vm->getIsDemo())
_vm->_graphicsManager.fadeOutLong();
@@ -686,9 +686,9 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_soundManager.loadSample(1, "SOUND44.WAV");
_vm->_soundManager.loadSample(2, "SOUND42.WAV");
_vm->_soundManager.loadSample(3, "SOUND41.WAV");
- _vm->_soundManager.SPECIAL_SOUND = 17;
+ _vm->_soundManager._specialSoundNum = 17;
_vm->_animationManager.playSequence("grenade.SEQ", 1, 32, 100);
- _vm->_soundManager.SPECIAL_SOUND = 0;
+ _vm->_soundManager._specialSoundNum = 0;
_vm->_graphicsManager.FADE_LINUX = 2;
_vm->_animationManager.playAnim("CREVE17.ANM", 24, 24, 200);
_vm->_soundManager.DEL_SAMPLE(1);
@@ -863,7 +863,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_eventsManager.mouseOff();
_vm->_graphicsManager.fadeInLong();
bool v52 = false;
- _vm->_soundManager.LOAD_WAV("SOUND46.WAV", 1);
+ _vm->_soundManager.loadWav("SOUND46.WAV", 1);
do {
if (_vm->shouldQuit())
return -1; // Exiting game
@@ -998,8 +998,8 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.SET_BOBPOSI(12, 0);
_vm->_objectsManager.SET_BOBPOSI(13, 0);
int v21 = 0;
- _vm->_soundManager.LOAD_WAV("SOUND44.WAV", 1);
- _vm->_soundManager.LOAD_WAV("SOUND71.WAV", 2);
+ _vm->_soundManager.loadWav("SOUND44.WAV", 1);
+ _vm->_soundManager.loadWav("SOUND71.WAV", 2);
do {
if (_vm->shouldQuit())
return -1; // Exiting game
@@ -1056,9 +1056,9 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.setBobAnimation(8);
_vm->_objectsManager.SET_BOBPOSI(11, 0);
_vm->_objectsManager.SET_BOBPOSI(8, 0);
- _vm->_soundManager.LOAD_WAV("SOUND44.WAV", 1);
- _vm->_soundManager.LOAD_WAV("SOUND48.WAV", 2);
- _vm->_soundManager.LOAD_WAV("SOUND49.WAV", 3);
+ _vm->_soundManager.loadWav("SOUND44.WAV", 1);
+ _vm->_soundManager.loadWav("SOUND48.WAV", 2);
+ _vm->_soundManager.loadWav("SOUND49.WAV", 3);
int v24 = 0;
do {
if (_vm->shouldQuit())
@@ -1480,9 +1480,9 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.removeSprite(0);
_vm->_objectsManager.setBobAnimation(4);
_vm->_objectsManager.SET_BOBPOSI(4, 0);
- _vm->_soundManager.LOAD_WAV("SOUND61.WAV", 1);
- _vm->_soundManager.LOAD_WAV("SOUND62.WAV", 2);
- _vm->_soundManager.LOAD_WAV("SOUND61.WAV", 3);
+ _vm->_soundManager.loadWav("SOUND61.WAV", 1);
+ _vm->_soundManager.loadWav("SOUND62.WAV", 2);
+ _vm->_soundManager.loadWav("SOUND61.WAV", 3);
do {
if (_vm->shouldQuit())
return -1; // Exiting game
@@ -1518,9 +1518,9 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.removeSprite(0);
_vm->_objectsManager.setBobAnimation(5);
_vm->_objectsManager.SET_BOBPOSI(5, 0);
- _vm->_soundManager.LOAD_WAV("SOUND61.WAV", 1);
- _vm->_soundManager.LOAD_WAV("SOUND62.WAV", 2);
- _vm->_soundManager.LOAD_WAV("SOUND61.WAV", 3);
+ _vm->_soundManager.loadWav("SOUND61.WAV", 1);
+ _vm->_soundManager.loadWav("SOUND62.WAV", 2);
+ _vm->_soundManager.loadWav("SOUND61.WAV", 3);
do {
if (_vm->shouldQuit())
return -1; // Exiting game
@@ -1763,7 +1763,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
case 204: {
_vm->_objectsManager.removeSprite(0);
_vm->_objectsManager.setBobAnimation(3);
- _vm->_soundManager.LOAD_WAV("SOUND67.WAV", 1);
+ _vm->_soundManager.loadWav("SOUND67.WAV", 1);
int v41 = 0;
do {
if (_vm->shouldQuit())
@@ -1785,7 +1785,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
case 205: {
_vm->_objectsManager.removeSprite(0);
_vm->_objectsManager.setBobAnimation(4);
- _vm->_soundManager.LOAD_WAV("SOUND69.WAV", 1);
+ _vm->_soundManager.loadWav("SOUND69.WAV", 1);
int v42 = 0;
do {
if (_vm->shouldQuit())
@@ -1811,11 +1811,11 @@ int ScriptManager::handleOpcode(byte *dataP) {
case 208: {
_vm->_globals._disableInventFl = true;
if (_vm->_globals._saveData->data[svField6] != _vm->_globals._saveData->data[svField401]) {
- _vm->_soundManager.SPECIAL_SOUND = 208;
+ _vm->_soundManager._specialSoundNum = 208;
_vm->_eventsManager._disableEscKeyFl = true;
_vm->_animationManager.playSequence("SORT.SEQ", 10, 4, 10);
_vm->_eventsManager._disableEscKeyFl = false;
- _vm->_soundManager.SPECIAL_SOUND = 0;
+ _vm->_soundManager._specialSoundNum = 0;
}
_vm->_globals.NOT_VERIF = true;
_vm->_globals.chemin = (int16 *)g_PTRNUL;
@@ -1880,9 +1880,9 @@ int ScriptManager::handleOpcode(byte *dataP) {
case 210:
_vm->_animationManager.NO_SEQ = true;
- _vm->_soundManager.SPECIAL_SOUND = 210;
+ _vm->_soundManager._specialSoundNum = 210;
_vm->_animationManager.playSequence2("SECRET1.SEQ", 1, 12, 1);
- _vm->_soundManager.SPECIAL_SOUND = 0;
+ _vm->_soundManager._specialSoundNum = 0;
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 192, 152, 0);
_vm->_objectsManager.setBobAnimation(9);
_vm->_objectsManager.OBSSEUL = true;
@@ -1902,9 +1902,9 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.removeSprite(0);
_vm->_globals.CACHE_OFF();
_vm->_animationManager.NO_SEQ = true;
- _vm->_soundManager.SPECIAL_SOUND = 211;
+ _vm->_soundManager._specialSoundNum = 211;
_vm->_animationManager.playSequence("SECRET2.SEQ", 1, 12, 100);
- _vm->_soundManager.SPECIAL_SOUND = 0;
+ _vm->_soundManager._specialSoundNum = 0;
_vm->_animationManager.NO_SEQ = false;
_vm->_graphicsManager._noFadingFl = true;
_vm->_graphicsManager.fadeOutLong();
@@ -1935,9 +1935,9 @@ int ScriptManager::handleOpcode(byte *dataP) {
break;
case 229:
- _vm->_soundManager.SPECIAL_SOUND = 229;
+ _vm->_soundManager._specialSoundNum = 229;
_vm->_animationManager.playSequence("MUR.SEQ", 1, 12, 1);
- _vm->_soundManager.SPECIAL_SOUND = 0;
+ _vm->_soundManager._specialSoundNum = 0;
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 340, 157, 2);
break;
@@ -2281,10 +2281,10 @@ int ScriptManager::handleOpcode(byte *dataP) {
case 603:
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 163, 7, false);
_vm->_objectsManager.OPTI_ONE(3, 0, 16, 4);
- _vm->_soundManager.SPECIAL_SOUND = 199;
+ _vm->_soundManager._specialSoundNum = 199;
_vm->_graphicsManager.FADE_LINUX = 2;
_vm->_animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500);
- _vm->_soundManager.SPECIAL_SOUND = 0;
+ _vm->_soundManager._specialSoundNum = 0;
memset(_vm->_graphicsManager._vesaBuffer, 0, 614400);
_vm->_graphicsManager._noFadingFl = true;
_vm->_globals._exitId = 151;
@@ -2293,9 +2293,9 @@ int ScriptManager::handleOpcode(byte *dataP) {
case 604:
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 163, 7, false);
_vm->_objectsManager.OPTI_ONE(1, 0, 16, 4);
- _vm->_soundManager.SPECIAL_SOUND = 199;
+ _vm->_soundManager._specialSoundNum = 199;
_vm->_animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500);
- _vm->_soundManager.SPECIAL_SOUND = 0;
+ _vm->_soundManager._specialSoundNum = 0;
_vm->_graphicsManager._noFadingFl = true;
memset(_vm->_graphicsManager._vesaBuffer, 0, 614400);
_vm->_globals._exitId = 151;
@@ -2305,10 +2305,10 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 163, 7, false);
_vm->_objectsManager.OPTI_ONE(5, 0, 16, 4);
_vm->_graphicsManager.fadeOutShort();
- _vm->_soundManager.SPECIAL_SOUND = 199;
+ _vm->_soundManager._specialSoundNum = 199;
_vm->_graphicsManager.FADE_LINUX = 2;
_vm->_animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500);
- _vm->_soundManager.SPECIAL_SOUND = 0;
+ _vm->_soundManager._specialSoundNum = 0;
_vm->_graphicsManager._noFadingFl = true;
memset(_vm->_graphicsManager._vesaBuffer, 0, 614400);
_vm->_globals._exitId = 151;
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 2104f5648c..24001cbb6f 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -188,7 +188,7 @@ Audio::AudioStream *makeTwaStream(Common::String name, Common::SeekableReadStrea
namespace Hopkins {
SoundManager::SoundManager() {
- SPECIAL_SOUND = 0;
+ _specialSoundNum = 0;
_soundVolume = 0;
_voiceVolume = 0;
_musicVolume = 0;
@@ -198,9 +198,9 @@ SoundManager::SoundManager() {
_textOffFl = false;
_soundFl = false;
VBL_MERDE = false;
- SOUND_NUM = 0;
- old_music = 0;
- MOD_FLAG = false;
+ _currentSoundIndex = 0;
+ _oldSoundNumber = 0;
+ _modPlayingFl = false;
for (int i = 0; i < VOICE_COUNT; ++i)
Common::fill((byte *)&Voice[i], (byte *)&Voice[i] + sizeof(VoiceItem), 0);
@@ -215,29 +215,29 @@ SoundManager::~SoundManager() {
stopMusic();
delMusic();
_vm->_mixer->stopHandle(_musicHandle);
- MOD_FLAG = false;
+ _modPlayingFl = false;
}
void SoundManager::setParent(HopkinsEngine *vm) {
_vm = vm;
- SPECIAL_SOUND = 0;
+ _specialSoundNum = 0;
}
void SoundManager::WSOUND_INIT() {
warning("TODO: WSOUND_INIT");
}
-void SoundManager::VERIF_SOUND() {
+void SoundManager::checkSoundEnd() {
if (!_soundOffFl && _soundFl) {
- if (!VOICE_STAT(1)) {
+ if (!checkVoiceStatus(1)) {
stopVoice(1);
- DEL_NWAV(SOUND_NUM);
+ DEL_NWAV(_currentSoundIndex);
}
}
}
-void SoundManager::LOAD_ANM_SOUND() {
- switch (SPECIAL_SOUND) {
+void SoundManager::loadAnimSound() {
+ switch (_specialSoundNum) {
case 2:
loadSample(5, "mitra1.wav");
loadSample(1, "tir2.wav");
@@ -246,41 +246,41 @@ void SoundManager::LOAD_ANM_SOUND() {
loadSample(4, "sound4.WAV");
break;
case 5:
- LOAD_WAV("CRIE.WAV", 1);
+ loadWav("CRIE.WAV", 1);
break;
case 14:
- LOAD_WAV("SOUND14.WAV", 1);
+ loadWav("SOUND14.WAV", 1);
break;
case 16:
- LOAD_WAV("SOUND16.WAV", 1);
+ loadWav("SOUND16.WAV", 1);
break;
case 198:
- LOAD_WAV("SOUND3.WAV", 1);
+ loadWav("SOUND3.WAV", 1);
break;
case 199:
- LOAD_WAV("SOUND22.WAV", 1);
+ loadWav("SOUND22.WAV", 1);
break;
case 200:
mixVoice(682, 1);
break;
case 208:
- LOAD_WAV("SOUND77.WAV", 1);
+ loadWav("SOUND77.WAV", 1);
break;
case 210:
- LOAD_WAV("SOUND78.WAV", 1);
+ loadWav("SOUND78.WAV", 1);
break;
case 211:
- LOAD_WAV("SOUND78.WAV", 1);
+ loadWav("SOUND78.WAV", 1);
break;
case 229:
- LOAD_WAV("SOUND80.WAV", 1);
- LOAD_WAV("SOUND82.WAV", 2);
+ loadWav("SOUND80.WAV", 1);
+ loadWav("SOUND82.WAV", 2);
break;
}
}
-void SoundManager::playAnim_SOUND(int soundNumber) {
- if (!_vm->_globals._censorshipFl && SPECIAL_SOUND == 2) {
+void SoundManager::playAnimSound(int soundNumber) {
+ if (!_vm->_globals._censorshipFl && _specialSoundNum == 2) {
switch (soundNumber) {
case 20:
PLAY_SAMPLE2(5);
@@ -300,32 +300,32 @@ void SoundManager::playAnim_SOUND(int soundNumber) {
PLAY_SAMPLE2(4);
break;
}
- } else if (SPECIAL_SOUND == 1 && soundNumber == 17)
+ } else if (_specialSoundNum == 1 && soundNumber == 17)
playSound("SOUND42.WAV");
- else if (SPECIAL_SOUND == 5 && soundNumber == 19)
+ else if (_specialSoundNum == 5 && soundNumber == 19)
playWav(1);
- else if (SPECIAL_SOUND == 14 && soundNumber == 625)
+ else if (_specialSoundNum == 14 && soundNumber == 625)
playWav(1);
- else if (SPECIAL_SOUND == 16 && soundNumber == 25)
+ else if (_specialSoundNum == 16 && soundNumber == 25)
playWav(1);
- else if (SPECIAL_SOUND == 17) {
+ else if (_specialSoundNum == 17) {
if (soundNumber == 6)
PLAY_SAMPLE2(1);
else if (soundNumber == 14)
PLAY_SAMPLE2(2);
else if (soundNumber == 67)
PLAY_SAMPLE2(3);
- } else if (SPECIAL_SOUND == 198 && soundNumber == 15)
+ } else if (_specialSoundNum == 198 && soundNumber == 15)
playWav(1);
- else if (SPECIAL_SOUND == 199 && soundNumber == 72)
+ else if (_specialSoundNum == 199 && soundNumber == 72)
playWav(1);
- else if (SPECIAL_SOUND == 208 && soundNumber == 40)
+ else if (_specialSoundNum == 208 && soundNumber == 40)
playWav(1);
- else if (SPECIAL_SOUND == 210 && soundNumber == 2)
+ else if (_specialSoundNum == 210 && soundNumber == 2)
playWav(1);
- else if (SPECIAL_SOUND == 211 && soundNumber == 22)
+ else if (_specialSoundNum == 211 && soundNumber == 22)
playWav(1);
- else if (SPECIAL_SOUND == 229) {
+ else if (_specialSoundNum == 229) {
if (soundNumber == 15)
playWav(1);
else if (soundNumber == 91)
@@ -349,12 +349,12 @@ void SoundManager::WSOUND(int soundNumber) {
return;
}
- if (old_music != soundNumber || !MOD_FLAG) {
- if (MOD_FLAG)
+ if (_oldSoundNumber != soundNumber || !_modPlayingFl) {
+ if (_modPlayingFl)
WSOUND_OFF();
- PLAY_MOD(modSounds[soundNumber - 1]);
- old_music = soundNumber;
+ playMod(modSounds[soundNumber - 1]);
+ _oldSoundNumber = soundNumber;
}
}
@@ -363,19 +363,19 @@ void SoundManager::WSOUND_OFF() {
stopVoice(1);
stopVoice(2);
if (_vm->_soundManager._soundFl)
- DEL_NWAV(SOUND_NUM);
+ DEL_NWAV(_currentSoundIndex);
for (int i = 1; i <= 48; ++i)
DEL_SAMPLE_SDL(i);
- if (MOD_FLAG) {
+ if (_modPlayingFl) {
stopMusic();
delMusic();
- MOD_FLAG = false;
+ _modPlayingFl = false;
}
}
-void SoundManager::PLAY_MOD(const Common::String &file) {
+void SoundManager::playMod(const Common::String &file) {
if (_musicOffFl)
return;
Common::String modFile = file;
@@ -395,15 +395,15 @@ void SoundManager::PLAY_MOD(const Common::String &file) {
modFile += "2";
}
}
- if (MOD_FLAG) {
+ if (_modPlayingFl) {
stopMusic();
delMusic();
- MOD_FLAG = false;
+ _modPlayingFl = false;
}
loadMusic(modFile);
playMusic();
- MOD_FLAG = true;
+ _modPlayingFl = true;
}
void SoundManager::loadMusic(const Common::String &file) {
@@ -446,20 +446,20 @@ void SoundManager::delMusic() {
}
void SoundManager::checkSounds() {
- checkVoices();
+ checkVoiceActivity();
}
-void SoundManager::checkVoices() {
+void SoundManager::checkVoiceActivity() {
// Check the status of each voice.
bool hasActiveVoice = false;
for (int i = 0; i < VOICE_COUNT; ++i) {
- VOICE_STAT(i);
- hasActiveVoice |= Voice[i]._status != 0;
+ checkVoiceStatus(i);
+ hasActiveVoice |= Voice[i]._status;
}
if (!hasActiveVoice && _soundFl) {
_soundFl = false;
- SOUND_NUM = 0;
+ _currentSoundIndex = 0;
}
}
@@ -476,59 +476,31 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode) {
if (_voiceOffFl)
return false;
- if ((unsigned int)(voiceMode - 1) <= 1
- && (voiceId == 4
- || voiceId == 16
- || voiceId == 121
- || voiceId == 142
- || voiceId == 182
- || voiceId == 191
- || voiceId == 212
- || voiceId == 225
- || voiceId == 239
- || voiceId == 245
- || voiceId == 297
- || voiceId == 308
- || voiceId == 333
- || voiceId == 348
- || voiceId == 352
- || voiceId == 358
- || voiceId == 364
- || voiceId == 371
- || voiceId == 394
- || voiceId == 414
- || voiceId == 429
- || voiceId == 442
- || voiceId == 446
- || voiceId == 461
- || voiceId == 468
- || voiceId == 476
- || voiceId == 484
- || voiceId == 491
- || voiceId == 497
- || voiceId == 501
- || voiceId == 511
- || voiceId == 520
- || voiceId == 536
- || voiceId == 554
- || voiceId == 566
- || voiceId == 573
- || voiceId == 632
- || voiceId == 645))
+ if ((voiceMode == 1 || voiceMode == 2)
+ && ( voiceId == 4 || voiceId == 16 || voiceId == 121
+ || voiceId == 142 || voiceId == 182 || voiceId == 191
+ || voiceId == 212 || voiceId == 225 || voiceId == 239
+ || voiceId == 245 || voiceId == 297 || voiceId == 308
+ || voiceId == 333 || voiceId == 348 || voiceId == 352
+ || voiceId == 358 || voiceId == 364 || voiceId == 371
+ || voiceId == 394 || voiceId == 414 || voiceId == 429
+ || voiceId == 442 || voiceId == 446 || voiceId == 461
+ || voiceId == 468 || voiceId == 476 || voiceId == 484
+ || voiceId == 491 || voiceId == 497 || voiceId == 501
+ || voiceId == 511 || voiceId == 520 || voiceId == 536
+ || voiceId == 554 || voiceId == 566 || voiceId == 573
+ || voiceId == 632 || voiceId == 645))
fileNumber = 684;
- if ((unsigned int)(voiceMode - 1) <= 1) {
+ if (voiceMode == 1 || voiceMode == 2)
prefix = "DF";
- }
- if (voiceMode == 3) {
+ else if (voiceMode == 3)
prefix = "IF";
- }
- if (voiceMode == 4) {
+ else if (voiceMode == 4)
prefix = "TF";
- }
- if (voiceMode == 5) {
+ else if (voiceMode == 5)
prefix = "OF";
- }
+
filename = Common::String::format("%s%d", prefix.c_str(), fileNumber);
@@ -595,14 +567,14 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode) {
// Loop for playing voice
breakFlag = 0;
do {
- if (SPECIAL_SOUND != 4 && !VBL_MERDE)
+ if (_specialSoundNum != 4 && !VBL_MERDE)
_vm->_eventsManager.VBL();
if (_vm->_eventsManager.getMouseButton())
break;
_vm->_eventsManager.refreshEvents();
if (_vm->_eventsManager._escKeyFl)
break;
- if (!VOICE_STAT(2))
+ if (!checkVoiceStatus(2))
breakFlag = true;
} while (!_vm->shouldQuit() && !breakFlag);
@@ -616,11 +588,11 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode) {
}
void SoundManager::DEL_SAMPLE(int soundIndex) {
- if (VOICE_STAT(1) == 1)
+ if (checkVoiceStatus(1))
stopVoice(1);
- if (VOICE_STAT(2) == 2)
+ if (checkVoiceStatus(2))
stopVoice(2);
- if (VOICE_STAT(3) == 3)
+ if (checkVoiceStatus(3))
stopVoice(3);
DEL_SAMPLE_SDL(soundIndex);
SOUND[soundIndex]._active = false;
@@ -629,7 +601,7 @@ void SoundManager::DEL_SAMPLE(int soundIndex) {
void SoundManager::playSound(const Common::String &file) {
if (!_soundOffFl) {
if (_soundFl)
- DEL_NWAV(SOUND_NUM);
+ DEL_NWAV(_currentSoundIndex);
LOAD_NWAV(file, 1);
PLAY_NWAV(1);
}
@@ -662,24 +634,21 @@ void SoundManager::loadSample(int wavIndex, const Common::String &file) {
void SoundManager::playSample(int wavIndex, int voiceMode) {
if (!_soundOffFl && SOUND[wavIndex]._active) {
if (_soundFl)
- DEL_NWAV(SOUND_NUM);
+ DEL_NWAV(_currentSoundIndex);
if (voiceMode == 5) {
- if (VOICE_STAT(1) == 1)
+ if (checkVoiceStatus(1))
stopVoice(1);
PLAY_SAMPLE_SDL(1, wavIndex);
- }
- if (voiceMode == 6) {
- if (VOICE_STAT(2) == 1)
+ } else if (voiceMode == 6) {
+ if (checkVoiceStatus(2))
stopVoice(1);
PLAY_SAMPLE_SDL(2, wavIndex);
- }
- if (voiceMode == 7) {
- if (VOICE_STAT(3) == 1)
+ } else if (voiceMode == 7) {
+ if (checkVoiceStatus(3))
stopVoice(1);
PLAY_SAMPLE_SDL(3, wavIndex);
- }
- if (voiceMode == 8) {
- if (VOICE_STAT(1) == 1)
+ } else if (voiceMode == 8) {
+ if (checkVoiceStatus(1))
stopVoice(1);
PLAY_SAMPLE_SDL(1, wavIndex);
}
@@ -689,14 +658,14 @@ void SoundManager::playSample(int wavIndex, int voiceMode) {
void SoundManager::PLAY_SAMPLE2(int idx) {
if (!_soundOffFl && SOUND[idx]._active) {
if (_soundFl)
- DEL_NWAV(SOUND_NUM);
- if (VOICE_STAT(1) == 1)
+ DEL_NWAV(_currentSoundIndex);
+ if (checkVoiceStatus(1))
stopVoice(1);
PLAY_SAMPLE_SDL(1, idx);
}
}
-void SoundManager::LOAD_WAV(const Common::String &file, int wavIndex) {
+void SoundManager::loadWav(const Common::String &file, int wavIndex) {
LOAD_NWAV(file, wavIndex);
}
@@ -704,7 +673,7 @@ void SoundManager::playWav(int wavIndex) {
PLAY_NWAV(wavIndex);
}
-int SoundManager::VOICE_STAT(int voiceIndex) {
+bool SoundManager::checkVoiceStatus(int voiceIndex) {
if (Voice[voiceIndex]._status) {
int wavIndex = Voice[voiceIndex]._wavIndex;
if (Swav[wavIndex]._audioStream != NULL && Swav[wavIndex]._audioStream->endOfStream())
@@ -716,14 +685,14 @@ int SoundManager::VOICE_STAT(int voiceIndex) {
void SoundManager::stopVoice(int voiceIndex) {
if (Voice[voiceIndex]._status) {
- Voice[voiceIndex]._status = 0;
+ Voice[voiceIndex]._status = false;
int wavIndex = Voice[voiceIndex]._wavIndex;
if (Swav[wavIndex]._active) {
if (Swav[wavIndex]._freeSampleFl)
DEL_SAMPLE_SDL(wavIndex);
}
}
- Voice[voiceIndex]._status = 0;
+ Voice[voiceIndex]._status = false;
}
void SoundManager::SDL_LVOICE(Common::String filename, size_t filePosition, size_t entryLength) {
@@ -790,17 +759,17 @@ void SoundManager::LOAD_NWAV(const Common::String &file, int wavIndex) {
void SoundManager::PLAY_NWAV(int wavIndex) {
if (!_soundFl && !_soundOffFl) {
_soundFl = true;
- SOUND_NUM = wavIndex;
+ _currentSoundIndex = wavIndex;
PLAY_SAMPLE_SDL(1, wavIndex);
}
}
void SoundManager::DEL_NWAV(int wavIndex) {
if (DEL_SAMPLE_SDL(wavIndex)) {
- if (VOICE_STAT(1) == 1)
+ if (checkVoiceStatus(1))
stopVoice(1);
- SOUND_NUM = 0;
+ _currentSoundIndex = 0;
_soundFl = false;
}
}
@@ -809,10 +778,10 @@ void SoundManager::PLAY_SAMPLE_SDL(int voiceIndex, int wavIndex) {
if (!Swav[wavIndex]._active)
warning("Bad handle");
- if (Voice[voiceIndex]._status == 1 && Swav[wavIndex]._active && Swav[wavIndex]._freeSampleFl)
+ if (Voice[voiceIndex]._status && Swav[wavIndex]._active && Swav[wavIndex]._freeSampleFl)
DEL_SAMPLE_SDL(wavIndex);
- Voice[voiceIndex]._status = 1;
+ Voice[voiceIndex]._status = true;
Voice[voiceIndex]._wavIndex = wavIndex;
int volume = (voiceIndex == 2) ? _voiceVolume * 255 / 16 : _soundVolume * 255 / 16;
diff --git a/engines/hopkins/sound.h b/engines/hopkins/sound.h
index fecd05aaeb..dcd6af5ba3 100644
--- a/engines/hopkins/sound.h
+++ b/engines/hopkins/sound.h
@@ -33,7 +33,7 @@ namespace Hopkins {
class VoiceItem {
public:
- int _status;
+ bool _status;
int _wavIndex;
};
@@ -65,7 +65,7 @@ class SoundManager {
private:
HopkinsEngine *_vm;
- int VOICE_STAT(int voiceIndex);
+ bool checkVoiceStatus(int voiceIndex);
void stopVoice(int voiceIndex);
void SDL_LVOICE(Common::String filename, size_t filePosition, size_t entryLength);
void playVoice();
@@ -80,7 +80,7 @@ private:
/**
* Checks voices to see if they're finished
*/
- void checkVoices();
+ void checkVoiceActivity();
/**
* Creates an audio stream based on a passed raw stream
@@ -88,7 +88,7 @@ private:
Audio::RewindableAudioStream *makeSoundStream(Common::SeekableReadStream *stream);
public:
Audio::SoundHandle _musicHandle;
- int SPECIAL_SOUND;
+ int _specialSoundNum;
int _soundVolume;
int _voiceVolume;
int _musicVolume;
@@ -98,9 +98,9 @@ public:
bool _textOffFl;
bool _soundFl;
bool VBL_MERDE;
- int SOUND_NUM;
- bool MOD_FLAG;
- int old_music;
+ int _currentSoundIndex;
+ bool _modPlayingFl;
+ int _oldSoundNumber;
VoiceItem Voice[VOICE_COUNT];
SwavItem Swav[SWAV_COUNT];
@@ -112,13 +112,13 @@ public:
void setParent(HopkinsEngine *vm);
void WSOUND_INIT();
- void VERIF_SOUND();
- void LOAD_ANM_SOUND();
- void playAnim_SOUND(int soundNumber);
- void LOAD_WAV(const Common::String &file, int wavIndex);
+ void checkSoundEnd();
+ void loadAnimSound();
+ void playAnimSound(int soundNumber);
+ void loadWav(const Common::String &file, int wavIndex);
void WSOUND(int soundNumber);
void WSOUND_OFF();
- void PLAY_MOD(const Common::String &file);
+ void playMod(const Common::String &file);
void loadMusic(const Common::String &file);
void playMusic();
void stopMusic();
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index 158a644b84..9140c3efd9 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -40,8 +40,7 @@ TalkManager::TalkManager() {
_characterAnim = NULL;
_characterSize = 0;
STATI = false;
- PLIGNE1 = PLIGNE2 = 0;
- PLIGNE3 = PLIGNE4 = 0;
+ _dialogueMesgId1 = _dialogueMesgId2 = _dialogueMesgId3 = _dialogueMesgId4 = 0;
_paletteBufferIdx = 0;
}
@@ -56,7 +55,7 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
_vm->_fontManager.hideText(5);
_vm->_fontManager.hideText(9);
_vm->_eventsManager.VBL();
- _vm->_graphicsManager.no_scroll = 1;
+ _vm->_graphicsManager._scrollStatus = 1;
bool oldDisableInventFl = _vm->_globals._disableInventFl;
_vm->_globals._disableInventFl = true;
_characterBuffer = _vm->_fileManager.searchCat(filename, 5);
@@ -76,7 +75,7 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
} else if (_vm->_globals._language == LANG_SP) {
_answersFilename = _questionsFilename = "RUEES.TXT";
}
- PLIGNE1 = (int16)READ_LE_UINT16((uint16 *)_characterBuffer + 40);
+ _dialogueMesgId1 = (int16)READ_LE_UINT16((uint16 *)_characterBuffer + 40);
_paletteBufferIdx = 20 * (int16)READ_LE_UINT16((uint16 *)_characterBuffer + 42) + 110;
_characterSprite = _vm->_fileManager.searchCat(spriteFilename, 7);
if (_characterSprite) {
@@ -97,9 +96,9 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
searchCharacterPalette(_paletteBufferIdx, false);
startCharacterAnim0(_paletteBufferIdx, false);
initCharacterAnim();
- PLIGNE2 = PLIGNE1 + 1;
- PLIGNE3 = PLIGNE1 + 2;
- PLIGNE4 = PLIGNE1 + 3;
+ _dialogueMesgId2 = _dialogueMesgId1 + 1;
+ _dialogueMesgId3 = _dialogueMesgId1 + 2;
+ _dialogueMesgId4 = _dialogueMesgId1 + 3;
int v14 = _vm->_eventsManager._mouseCursorId;
_vm->_eventsManager._mouseCursorId = 4;
_vm->_eventsManager.changeMouseCursor(0);
@@ -107,12 +106,12 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
int v5;
do {
v5 = DIALOGUE();
- if (v5 != PLIGNE4)
+ if (v5 != _dialogueMesgId4)
answer = DIALOGUE_REP(v5);
if (answer == -1)
- v5 = PLIGNE4;
+ v5 = _dialogueMesgId4;
_vm->_eventsManager.VBL();
- } while (v5 != PLIGNE4);
+ } while (v5 != _dialogueMesgId4);
}
if (_vm->_globals.NOPARLE) {
int v6 = 1;
@@ -149,7 +148,7 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
_vm->_graphicsManager.DD_VBL();
for (int i = 0; i <= 4; i++)
_vm->_eventsManager.VBL();
- _vm->_graphicsManager.no_scroll = 0;
+ _vm->_graphicsManager._scrollStatus = 0;
}
void TalkManager::PARLER_PERSO2(const Common::String &filename) {
@@ -183,12 +182,12 @@ void TalkManager::PARLER_PERSO2(const Common::String &filename) {
break;
}
- PLIGNE1 = (int16)READ_LE_UINT16((uint16 *)_characterBuffer + 40);
+ _dialogueMesgId1 = (int16)READ_LE_UINT16((uint16 *)_characterBuffer + 40);
_paletteBufferIdx = 20 * (int16)READ_LE_UINT16((uint16 *)_characterBuffer + 42) + 110;
searchCharacterPalette(_paletteBufferIdx, false);
- PLIGNE2 = PLIGNE1 + 1;
- PLIGNE3 = PLIGNE1 + 2;
- PLIGNE4 = PLIGNE1 + 3;
+ _dialogueMesgId2 = _dialogueMesgId1 + 1;
+ _dialogueMesgId3 = _dialogueMesgId1 + 2;
+ _dialogueMesgId4 = _dialogueMesgId1 + 3;
int oldMouseCursorId = _vm->_eventsManager._mouseCursorId;
_vm->_eventsManager._mouseCursorId = 4;
_vm->_eventsManager.changeMouseCursor(0);
@@ -197,11 +196,11 @@ void TalkManager::PARLER_PERSO2(const Common::String &filename) {
int v3;
do {
v3 = DIALOGUE();
- if (v3 != PLIGNE4) {
+ if (v3 != _dialogueMesgId4) {
if (DIALOGUE_REP(v3) == -1)
- v3 = PLIGNE4;
+ v3 = _dialogueMesgId4;
}
- } while (v3 != PLIGNE4);
+ } while (v3 != _dialogueMesgId4);
}
if (_vm->_globals.NOPARLE) {
@@ -245,20 +244,20 @@ int TalkManager::DIALOGUE() {
dialogWait();
}
- int sentence1LineNumb = VERIF_BOITE(PLIGNE1, _questionsFilename, 65);
- int sentence2LineNumb = VERIF_BOITE(PLIGNE2, _questionsFilename, 65);
- int sentence3LineNumb = VERIF_BOITE(PLIGNE3, _questionsFilename, 65);
- int sentence4LineNumb = VERIF_BOITE(PLIGNE4, _questionsFilename, 65);
+ int sentence1LineNumb = VERIF_BOITE(_dialogueMesgId1, _questionsFilename, 65);
+ int sentence2LineNumb = VERIF_BOITE(_dialogueMesgId2, _questionsFilename, 65);
+ int sentence3LineNumb = VERIF_BOITE(_dialogueMesgId3, _questionsFilename, 65);
+ int sentence4LineNumb = VERIF_BOITE(_dialogueMesgId4, _questionsFilename, 65);
int sentence4PosY = 420 - 20 * sentence4LineNumb;
int sentence3PosY = sentence4PosY - 20 * sentence3LineNumb;
int sentence2PosY = sentence3PosY - 20 * sentence2LineNumb;
int sentence1PosY = sentence2PosY - 20 * sentence1LineNumb;
- _vm->_fontManager.initTextBuffers(5, PLIGNE1, _questionsFilename, 5, sentence1PosY, 0, 65, 255);
- _vm->_fontManager.initTextBuffers(6, PLIGNE2, _questionsFilename, 5, sentence2PosY, 0, 65, 255);
- _vm->_fontManager.initTextBuffers(7, PLIGNE3, _questionsFilename, 5, sentence3PosY, 0, 65, 255);
- _vm->_fontManager.initTextBuffers(8, PLIGNE4, _questionsFilename, 5, sentence4PosY, 0, 65, 255);
+ _vm->_fontManager.initTextBuffers(5, _dialogueMesgId1, _questionsFilename, 5, sentence1PosY, 0, 65, 255);
+ _vm->_fontManager.initTextBuffers(6, _dialogueMesgId2, _questionsFilename, 5, sentence2PosY, 0, 65, 255);
+ _vm->_fontManager.initTextBuffers(7, _dialogueMesgId3, _questionsFilename, 5, sentence3PosY, 0, 65, 255);
+ _vm->_fontManager.initTextBuffers(8, _dialogueMesgId4, _questionsFilename, 5, sentence4PosY, 0, 65, 255);
_vm->_fontManager.showText(5);
_vm->_fontManager.showText(6);
_vm->_fontManager.showText(7);
@@ -270,19 +269,19 @@ int TalkManager::DIALOGUE() {
int mousePosY = _vm->_eventsManager.getMouseY();
if (sentence1PosY < mousePosY && mousePosY < (sentence2PosY - 1)) {
_vm->_fontManager.setOptimalColor(6, 7, 8, 5);
- retVal = PLIGNE1;
+ retVal = _dialogueMesgId1;
}
if (sentence2PosY < mousePosY && mousePosY < (sentence3PosY - 1)) {
_vm->_fontManager.setOptimalColor(5, 7, 8, 6);
- retVal = PLIGNE2;
+ retVal = _dialogueMesgId2;
}
if (sentence3PosY < mousePosY && mousePosY < (sentence4PosY - 1)) {
_vm->_fontManager.setOptimalColor(5, 6, 8, 7);
- retVal = PLIGNE3;
+ retVal = _dialogueMesgId3;
}
if (sentence4PosY < mousePosY && mousePosY < 419) {
_vm->_fontManager.setOptimalColor(5, 6, 7, 8);
- retVal = PLIGNE4;
+ retVal = _dialogueMesgId4;
}
_vm->_eventsManager.VBL();
@@ -351,9 +350,9 @@ int TalkManager::DIALOGUE_REP(int idx) {
v25 = (int16)READ_LE_UINT16((uint16 *)v3 + 2);
v24 = (int16)READ_LE_UINT16((uint16 *)v3 + 3);
v23 = (int16)READ_LE_UINT16((uint16 *)v3 + 4);
- PLIGNE1 = (int16)READ_LE_UINT16((uint16 *)v3 + 5);
- PLIGNE2 = (int16)READ_LE_UINT16((uint16 *)v3 + 6);
- PLIGNE3 = (int16)READ_LE_UINT16((uint16 *)v3 + 7);
+ _dialogueMesgId1 = (int16)READ_LE_UINT16((uint16 *)v3 + 5);
+ _dialogueMesgId2 = (int16)READ_LE_UINT16((uint16 *)v3 + 6);
+ _dialogueMesgId3 = (int16)READ_LE_UINT16((uint16 *)v3 + 7);
v6 = (int16)READ_LE_UINT16((uint16 *)v3 + 8);
v7 = (int16)READ_LE_UINT16((uint16 *)v3 + 9);
@@ -437,7 +436,7 @@ int TalkManager::DIALOGUE_REP(int idx) {
dialogEndTalk();
}
v21 = 0;
- if (!PLIGNE1)
+ if (!_dialogueMesgId1)
v21 = -1;
return v21;
@@ -1018,7 +1017,7 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
_vm->_fontManager.hideText(5);
_vm->_fontManager.hideText(9);
_vm->_eventsManager.VBL();
- _vm->_graphicsManager.no_scroll = 1;
+ _vm->_graphicsManager._scrollStatus = 1;
_vm->_linesManager.clearAllZones();
_vm->_linesManager.resetLines();
_vm->_globals.resetCache();
@@ -1133,7 +1132,7 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
_vm->_graphicsManager.DD_VBL();
for (int i = 0; i <= 4; i++)
_vm->_eventsManager.VBL();
- _vm->_graphicsManager.no_scroll = 0;
+ _vm->_graphicsManager._scrollStatus = 0;
}
} // End of namespace Hopkins
diff --git a/engines/hopkins/talk.h b/engines/hopkins/talk.h
index 090c804cbf..a71ddfba7b 100644
--- a/engines/hopkins/talk.h
+++ b/engines/hopkins/talk.h
@@ -42,8 +42,8 @@ public:
byte *_characterAnim;
size_t _characterSize;
bool STATI;
- int PLIGNE1, PLIGNE2;
- int PLIGNE3, PLIGNE4;
+ int _dialogueMesgId1, _dialogueMesgId2;
+ int _dialogueMesgId3, _dialogueMesgId4;
int _paletteBufferIdx;
public:
TalkManager();
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-19 12:01:21 +0000