aboutsummaryrefslogtreecommitdiff
path: root/engines/hopkins/talk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/hopkins/talk.cpp')
-rw-r--r--engines/hopkins/talk.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index 2c1281f59d..3404399014 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -470,26 +470,26 @@ void TalkManager::searchCharacterPalette(int startIdx, bool dark) {
void TalkManager::dialogWait() {
for (int idx = 26; idx <= 30; ++idx) {
- if (_vm->_globals->_animBqe[idx]._enabledFl)
+ if (_vm->_animationManager->_animBqe[idx]._enabledFl)
BOB_VISU_PARLE(idx);
}
}
void TalkManager::dialogTalk() {
for (int idx = 26; idx <= 30; ++idx) {
- if (_vm->_globals->_animBqe[idx]._enabledFl)
+ if (_vm->_animationManager->_animBqe[idx]._enabledFl)
_vm->_objectsManager->hideBob(idx);
}
for (int idx = 26; idx <= 30; ++idx) {
- if (_vm->_globals->_animBqe[idx]._enabledFl)
+ if (_vm->_animationManager->_animBqe[idx]._enabledFl)
_vm->_objectsManager->resetBob(idx);
}
}
void TalkManager::dialogEndTalk() {
for (int idx = 21; idx <= 25; ++idx) {
- if (_vm->_globals->_animBqe[idx]._enabledFl)
+ if (_vm->_animationManager->_animBqe[idx]._enabledFl)
_vm->_objectsManager->hideBob(idx);
}
@@ -497,7 +497,7 @@ void TalkManager::dialogEndTalk() {
_vm->_eventsManager->refreshScreenAndEvents();
for (int idx = 21; idx <= 25; ++idx) {
- if (_vm->_globals->_animBqe[idx]._enabledFl)
+ if (_vm->_animationManager->_animBqe[idx]._enabledFl)
_vm->_objectsManager->resetBob(idx);
}
}
@@ -592,7 +592,7 @@ int TalkManager::countBoxLines(int idx, const Common::String &file) {
void TalkManager::VISU_PARLE() {
for (int idx = 21; idx <= 25; ++idx) {
- if (_vm->_globals->_animBqe[idx]._enabledFl)
+ if (_vm->_animationManager->_animBqe[idx]._enabledFl)
BOB_VISU_PARLE(idx);
}
}
@@ -601,7 +601,7 @@ void TalkManager::BOB_VISU_PARLE(int idx) {
_vm->_objectsManager->_priorityFl = true;
if (!_vm->_objectsManager->_bob[idx]._bobMode) {
_vm->_objectsManager->resetBob(idx);
- byte *bqeData = _vm->_globals->_animBqe[idx]._data;
+ byte *bqeData = _vm->_animationManager->_animBqe[idx]._data;
int newMode = READ_LE_INT16(bqeData + 2);
if (!newMode)
newMode = 1;
@@ -609,7 +609,7 @@ void TalkManager::BOB_VISU_PARLE(int idx) {
_vm->_objectsManager->_bob[idx]._isSpriteFl = true;
_vm->_objectsManager->_bob[idx]._zoomFactor = 0;
_vm->_objectsManager->_bob[idx]._flipFl = false;
- _vm->_objectsManager->_bob[idx]._animData = _vm->_globals->_animBqe[idx]._data;
+ _vm->_objectsManager->_bob[idx]._animData = _vm->_animationManager->_animBqe[idx]._data;
_vm->_objectsManager->_bob[idx]._bobMode = 10;
bqeData = _characterSprite;
_vm->_objectsManager->_bob[idx]._spriteData = _characterSprite;
@@ -695,8 +695,8 @@ void TalkManager::initCharacterAnim() {
void TalkManager::clearCharacterAnim() {
for (int idx = 21; idx <= 34; ++idx) {
- _vm->_globals->_animBqe[idx]._data = _vm->_globals->freeMemory(_vm->_globals->_animBqe[idx]._data);
- _vm->_globals->_animBqe[idx]._enabledFl = false;
+ _vm->_animationManager->_animBqe[idx]._data = _vm->_globals->freeMemory(_vm->_animationManager->_animBqe[idx]._data);
+ _vm->_animationManager->_animBqe[idx]._enabledFl = false;
}
}
@@ -713,25 +713,25 @@ bool TalkManager::searchCharacterAnim(int idx, const byte *bufPerso, int animId,
if (READ_BE_UINT32(curPtr) == MKTAG('A', 'N', 'I', 'M') || READ_BE_UINT24(curPtr) == MKTAG24('F', 'I', 'N'))
loopCond = true;
if (bufIndx > bufferSize) {
- _vm->_globals->_animBqe[idx]._enabledFl = false;
- _vm->_globals->_animBqe[idx]._data = g_PTRNUL;
+ _vm->_animationManager->_animBqe[idx]._enabledFl = false;
+ _vm->_animationManager->_animBqe[idx]._data = g_PTRNUL;
return false;
}
++bufIndx;
++animLength;
++curPtr;
} while (!loopCond);
- _vm->_globals->_animBqe[idx]._data = _vm->_globals->allocMemory(animLength + 50);
- _vm->_globals->_animBqe[idx]._enabledFl = true;
- memcpy(_vm->_globals->_animBqe[idx]._data, (const byte *)(bufPerso + bufPos + 5), 20);
+ _vm->_animationManager->_animBqe[idx]._data = _vm->_globals->allocMemory(animLength + 50);
+ _vm->_animationManager->_animBqe[idx]._enabledFl = true;
+ memcpy(_vm->_animationManager->_animBqe[idx]._data, (const byte *)(bufPerso + bufPos + 5), 20);
int bqeVal = READ_LE_INT16(bufPos + bufPerso + 29);
- WRITE_LE_UINT16(_vm->_globals->_animBqe[idx]._data + 20, READ_LE_INT16(bufPos + bufPerso + 25));
- WRITE_LE_UINT16(_vm->_globals->_animBqe[idx]._data + 22, READ_LE_INT16(bufPos + bufPerso + 27));
- WRITE_LE_UINT16(_vm->_globals->_animBqe[idx]._data + 24, bqeVal);
- WRITE_LE_UINT16(_vm->_globals->_animBqe[idx]._data + 26, READ_LE_INT16(bufPos + bufPerso + 31));
- _vm->_globals->_animBqe[idx]._data[28] = bufPerso[bufPos + 33];
- _vm->_globals->_animBqe[idx]._data[29] = bufPerso[bufPos + 34];
- byte *bqeCurData = _vm->_globals->_animBqe[idx]._data + 20;
+ WRITE_LE_UINT16(_vm->_animationManager->_animBqe[idx]._data + 20, READ_LE_INT16(bufPos + bufPerso + 25));
+ WRITE_LE_UINT16(_vm->_animationManager->_animBqe[idx]._data + 22, READ_LE_INT16(bufPos + bufPerso + 27));
+ WRITE_LE_UINT16(_vm->_animationManager->_animBqe[idx]._data + 24, bqeVal);
+ WRITE_LE_UINT16(_vm->_animationManager->_animBqe[idx]._data + 26, READ_LE_INT16(bufPos + bufPerso + 31));
+ _vm->_animationManager->_animBqe[idx]._data[28] = bufPerso[bufPos + 33];
+ _vm->_animationManager->_animBqe[idx]._data[29] = bufPerso[bufPos + 34];
+ byte *bqeCurData = _vm->_animationManager->_animBqe[idx]._data + 20;
const byte *curBufPerso = bufPos + bufPerso + 25;
for (int i = 1; i < 5000; i++) {
bqeCurData += 10;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-02 19:57:26 +0000