Skip to content

Commit

Permalink
HOPKINS: Misc renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
@Strangerke
Strangerke committed Feb 20, 2013
1 parent 9aa7e13 commit f9f6133
Show file tree
Hide file tree
Showing 13 changed files with 94 additions and 97 deletions.
16 changes: 8 additions & 8 deletions engines/hopkins/anim.cpp
View file
Expand Up @@ -468,8 +468,8 @@ void AnimationManager::loadAnim(const Common::String &animName) {
*/
void AnimationManager::clearAnim() {
for (int idx = 0; idx < 35; ++idx) {
_vm->_globals.Bqe_Anim[idx]._data = _vm->_globals.freeMemory(_vm->_globals.Bqe_Anim[idx]._data);
_vm->_globals.Bqe_Anim[idx]._enabledFl = false;
_vm->_globals._animBqe[idx]._data = _vm->_globals.freeMemory(_vm->_globals._animBqe[idx]._data);
_vm->_globals._animBqe[idx]._enabledFl = false;
}

for (int idx = 0; idx < 8; ++idx) {
Expand Down Expand Up @@ -564,18 +564,18 @@ void AnimationManager::searchAnim(const byte *data, int animIndex, int bufSize)
if (READ_BE_UINT32(&data[curBufferPos]) == MKTAG('A', 'N', 'I', 'M') || READ_BE_UINT24(&data[curBufferPos]) == MKTAG24('F', 'I', 'N'))
innerLoopCond = true;
if (bufSize < curBufferPos) {
_vm->_globals.Bqe_Anim[animIndex]._enabledFl = false;
_vm->_globals.Bqe_Anim[animIndex]._data = g_PTRNUL;
_vm->_globals._animBqe[animIndex]._enabledFl = false;
_vm->_globals._animBqe[animIndex]._data = g_PTRNUL;
return;
}
++curBufferPos;
++count;
} while (!innerLoopCond);
_vm->_globals.Bqe_Anim[animIndex]._data = _vm->_globals.allocMemory(count + 50);
_vm->_globals.Bqe_Anim[animIndex]._enabledFl = true;
memcpy(_vm->_globals.Bqe_Anim[animIndex]._data, data + dataIdx + 5, 20);
_vm->_globals._animBqe[animIndex]._data = _vm->_globals.allocMemory(count + 50);
_vm->_globals._animBqe[animIndex]._enabledFl = true;
memcpy(_vm->_globals._animBqe[animIndex]._data, data + dataIdx + 5, 20);

byte *dataP = _vm->_globals.Bqe_Anim[animIndex]._data;
byte *dataP = _vm->_globals._animBqe[animIndex]._data;
int curDestDataIndx = 20;
int curSrcDataIndx = dataIdx + 25;

Expand Down
4 changes: 2 additions & 2 deletions engines/hopkins/dialogs.cpp
View file
Expand Up @@ -412,12 +412,12 @@ void DialogsManager::showInventory() {
if (_vm->_eventsManager._mouseCursorId == 8)
break;

_vm->_scriptManager.TRAVAILOBJET = true;
_vm->_scriptManager._tempObjectFl = true;
_vm->_globals._saveData->_data[svField3] = _vm->_objectsManager._curObjectIndex;
_vm->_globals._saveData->_data[svField8] = _vm->_globals._inventory[newInventoryItem];
_vm->_globals._saveData->_data[svField9] = _vm->_eventsManager._mouseCursorId;
_vm->_objectsManager.OPTI_OBJET();
_vm->_scriptManager.TRAVAILOBJET = false;
_vm->_scriptManager._tempObjectFl = false;

if (_vm->_soundManager._voiceOffFl) {
do
Expand Down
6 changes: 3 additions & 3 deletions engines/hopkins/globals.cpp
View file
Expand Up @@ -71,7 +71,7 @@ Globals::Globals() {
for (int i = 0; i < 6; ++i)
CACHE_BANQUE[i] = g_PTRNUL;
for (int i = 0; i < 35; ++i)
Common::fill((byte *)&Bqe_Anim[i], (byte *)&Bqe_Anim[i] + sizeof(BqeAnimItem), 0);
Common::fill((byte *)&_animBqe[i], (byte *)&_animBqe[i] + sizeof(BqeAnimItem), 0);
for (int i = 0; i < 8; ++i)
Common::fill((byte *)&Bank[i], (byte *)&Bank[i] + sizeof(BankItem), 0);
for (int i = 0; i < 6; ++i)
Expand Down Expand Up @@ -285,8 +285,8 @@ void Globals::loadCharacterData() {

void Globals::INIT_ANIM() {
for (int idx = 0; idx < 35; ++idx) {
Bqe_Anim[idx]._data = g_PTRNUL;
Bqe_Anim[idx]._enabledFl = false;
_animBqe[idx]._data = g_PTRNUL;
_animBqe[idx]._enabledFl = false;
}

for (int idx = 0; idx < 8; ++idx) {
Expand Down
2 changes: 1 addition & 1 deletion engines/hopkins/globals.h
View file
Expand Up @@ -308,7 +308,7 @@ class Globals {
bool NOMARCHE;
int iRegul;
byte *BUF_ZONE;
BqeAnimItem Bqe_Anim[35];
BqeAnimItem _animBqe[35];
byte *SPRITE_ECRAN;
byte *PERSO;
bool NOT_VERIF;
Expand Down
16 changes: 8 additions & 8 deletions engines/hopkins/graphics.cpp
View file
Expand Up @@ -1043,17 +1043,17 @@ void GraphicsManager::Sprite_Vesa(byte *surface, const byte *spriteData, int xp,
}
}

void GraphicsManager::FIN_VISU() {
void GraphicsManager::endDisplayBob() {
for (int idx = 1; idx <= 20; ++idx) {
if (_vm->_globals.Bqe_Anim[idx]._enabledFl)
_vm->_objectsManager.BOB_OFF(idx);
if (_vm->_globals._animBqe[idx]._enabledFl)
_vm->_objectsManager.hideBob(idx);
}

_vm->_eventsManager.VBL();
_vm->_eventsManager.VBL();

for (int idx = 1; idx <= 20; ++idx) {
if (_vm->_globals.Bqe_Anim[idx]._enabledFl)
if (_vm->_globals._animBqe[idx]._enabledFl)
_vm->_objectsManager.resetBob(idx);
}

Expand All @@ -1062,14 +1062,14 @@ void GraphicsManager::FIN_VISU() {
}

for (int idx = 1; idx <= 20; ++idx) {
_vm->_globals.Bqe_Anim[idx]._enabledFl = false;
_vm->_globals._animBqe[idx]._enabledFl = false;
}
}

void GraphicsManager::VISU_ALL() {
void GraphicsManager::displayAllBob() {
for (int idx = 1; idx <= 20; ++idx) {
if (_vm->_globals.Bqe_Anim[idx]._enabledFl)
_vm->_objectsManager.BOB_VISU(idx);
if (_vm->_globals._animBqe[idx]._enabledFl)
_vm->_objectsManager.displayBob(idx);
}
}

Expand Down
8 changes: 4 additions & 4 deletions engines/hopkins/graphics.h
View file
Expand Up @@ -123,6 +123,8 @@ class GraphicsManager {
void unlockScreen();
void clearPalette();
void clearScreen();
void addVesaSegment(int x1, int y1, int x2, int y2);
void copySurface(const byte *surface, int x1, int y1, int width, int height, byte *destSurface, int destX, int destY);
void loadImage(const Common::String &file);
void loadVgaImage(const Common::String &file);
void fadeInLong();
Expand All @@ -146,10 +148,10 @@ class GraphicsManager {
int zoomIn(int v, int percentage);
int zoomOut(int v, int percentage);
void initScreen(const Common::String &file, int mode, bool initializeScreen);
void displayAllBob();
void endDisplayBob();

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);
void copySurface(const byte *surface, int x1, int y1, int width, int height, byte *destSurface, int destX, int destY);
void SETCOLOR3(int palIndex, int r, int g, int b);
void SETCOLOR4(int palIndex, int r, int g, int b);
void AFFICHE_SPEEDVGA(const byte *objectData, int xp, int yp, int idx, bool addSegment = true);
Expand All @@ -163,8 +165,6 @@ class GraphicsManager {
void m_scroll16(const byte *surface, int xs, int ys, int width, int height, int destX, int destY);
void m_scroll16A(const byte *surface, int xs, int ys, int width, int height, int destX, int destY);
void Trans_bloc2(byte *surface, byte *col, int size);
void VISU_ALL();
void FIN_VISU();
void NB_SCREEN(bool initPalette);
void Reduc_Ecran(const byte *srcSruface, byte *destSurface, int xp, int yp, int width, int height, int zoom);
void Copy_WinScan_Vbe3(const byte *srcData, byte *destSurface);
Expand Down
26 changes: 13 additions & 13 deletions engines/hopkins/hopkins.cpp
View file
Expand Up @@ -1670,7 +1670,7 @@ void HopkinsEngine::playIntro() {
_graphicsManager.loadImage("intro2");
_graphicsManager.scrollScreen(0);
_animationManager.loadAnim("INTRO2");
_graphicsManager.VISU_ALL();
_graphicsManager.displayAllBob();
_soundManager.playSound(23);
_objectsManager.stopBobAnimation(3);
_objectsManager.stopBobAnimation(5);
Expand All @@ -1695,7 +1695,7 @@ void HopkinsEngine::playIntro() {
memcpy(&paletteData2, _graphicsManager._palette, 796);

_graphicsManager.setPaletteVGA256WithRefresh(paletteData, _graphicsManager._vesaBuffer);
_graphicsManager.FIN_VISU();
_graphicsManager.endDisplayBob();

if (shouldQuit() || _eventsManager._escKeyFl)
return;
Expand All @@ -1711,7 +1711,7 @@ void HopkinsEngine::playIntro() {
_graphicsManager.loadImage("intro2");
_graphicsManager.scrollScreen(0);
_animationManager.loadAnim("INTRO2");
_graphicsManager.VISU_ALL();
_graphicsManager.displayAllBob();
_soundManager.playSound(23);
_objectsManager.stopBobAnimation(3);
_objectsManager.stopBobAnimation(5);
Expand Down Expand Up @@ -1785,7 +1785,7 @@ void HopkinsEngine::playIntro() {
}

_graphicsManager.fadeOutLong();
_graphicsManager.FIN_VISU();
_graphicsManager.endDisplayBob();
_animationManager._clearAnimationFl = true;
_soundManager.playSound(3);
_soundManager._specialSoundNum = 1;
Expand Down Expand Up @@ -1869,7 +1869,7 @@ void HopkinsEngine::bombExplosion() {
_soundManager._specialSoundNum = 0;
_graphicsManager.loadImage("IM15");
_animationManager.loadAnim("ANIM15");
_graphicsManager.VISU_ALL();
_graphicsManager.displayAllBob();
_objectsManager.stopBobAnimation(7);

for (int idx = 0; idx < 5; ++idx) {
Expand All @@ -1893,7 +1893,7 @@ void HopkinsEngine::bombExplosion() {
}

_graphicsManager.fadeOutLong();
_graphicsManager.FIN_VISU();
_graphicsManager.endDisplayBob();
_globals.iRegul = 0;
_globals._exitId = 151;
}
Expand Down Expand Up @@ -1941,7 +1941,7 @@ void HopkinsEngine::handleConflagration() {
_graphicsManager.SETCOLOR3(253, 100, 100, 100);
_graphicsManager.SETCOLOR3(251, 100, 100, 100);
_graphicsManager.SETCOLOR3(254, 0, 0, 0);
_graphicsManager.VISU_ALL();
_graphicsManager.displayAllBob();

for (int cpt = 0; cpt <= 4; cpt++)
_eventsManager.VBL();
Expand All @@ -1960,7 +1960,7 @@ void HopkinsEngine::handleConflagration() {
_eventsManager.VBL();

_graphicsManager.fadeOutLong();
_graphicsManager.FIN_VISU();
_graphicsManager.endDisplayBob();
_globals._saveData->_data[svField312] = 1;
_globals._disableInventFl = false;
}
Expand Down Expand Up @@ -2021,7 +2021,7 @@ void HopkinsEngine::BASED() {
_animationManager.NO_COUL = false;
_graphicsManager.loadImage("IM92");
_animationManager.loadAnim("ANIM92");
_graphicsManager.VISU_ALL();
_graphicsManager.displayAllBob();
_objectsManager.loadLinkFile("IM92");

for (int cpt = 0; cpt <= 4; cpt++)
Expand All @@ -2035,7 +2035,7 @@ void HopkinsEngine::BASED() {
while (_objectsManager.getBobAnimDataIdx(8) != 22);

_graphicsManager.fadeOutLong();
_graphicsManager.FIN_VISU();
_graphicsManager.endDisplayBob();
_globals.resetCache();
_globals._disableInventFl = false;
_globals._exitId = 93;
Expand All @@ -2056,7 +2056,7 @@ void HopkinsEngine::playEnding() {
_soundManager.loadSample(1, "SOUND90.WAV");
_graphicsManager.loadImage("IM100");
_animationManager.loadAnim("ANIM100");
_graphicsManager.VISU_ALL();
_graphicsManager.displayAllBob();
_eventsManager.mouseOn();
_objectsManager.stopBobAnimation(7);
_objectsManager.stopBobAnimation(8);
Expand Down Expand Up @@ -2124,7 +2124,7 @@ void HopkinsEngine::playEnding() {
_soundManager._skipRefreshFl = true;
_graphicsManager.FADE_LINUX = 2;
_animationManager.playAnim("BERM.ANM", 100, 24, 300);
_graphicsManager.FIN_VISU();
_graphicsManager.endDisplayBob();
_soundManager.removeSample(1);
_graphicsManager.loadImage("PLAN3");
_graphicsManager.fadeInLong();
Expand Down Expand Up @@ -2177,7 +2177,7 @@ void HopkinsEngine::playEnding() {
while (_objectsManager.getBobAnimDataIdx(8) != 21);

_graphicsManager.fadeOutLong();
_graphicsManager.FIN_VISU();
_graphicsManager.endDisplayBob();
_soundManager.removeSample(1);
_soundManager.playSound(16);
_globals.iRegul = 1;
Expand Down
32 changes: 17 additions & 15 deletions engines/hopkins/objects.cpp
View file
Expand Up @@ -573,15 +573,15 @@ void ObjectsManager::setBobInfo(int idx) {
_vm->_globals.Liste2[idx]._posY + _vm->_globals.Liste2[idx]._height);
}

void ObjectsManager::BOB_VISU(int idx) {
void ObjectsManager::displayBob(int idx) {
_priorityFl = true;

if (_bob[idx].field0)
return;

resetBob(idx);

const byte *data = _vm->_globals.Bqe_Anim[idx]._data;
const byte *data = _vm->_globals._animBqe[idx]._data;
int bankIdx = READ_LE_INT16(data);
if (!bankIdx)
return;
Expand All @@ -607,7 +607,7 @@ void ObjectsManager::BOB_VISU(int idx) {
_bob[idx]._flipFl = false;
}

_bob[idx]._animData = _vm->_globals.Bqe_Anim[idx]._data;
_bob[idx]._animData = _vm->_globals._animBqe[idx]._data;
_bob[idx].field0 = 10;
_bob[idx]._spriteData = _vm->_globals.Bank[bankIdx]._data;

Expand All @@ -617,7 +617,7 @@ void ObjectsManager::BOB_VISU(int idx) {
_bob[idx]._offsetY = offsetY;
}

void ObjectsManager::BOB_OFF(int idx) {
void ObjectsManager::hideBob(int idx) {
if ((_bob[idx].field0 == 3) || (_bob[idx].field0 == 10))
_bob[idx].field0++;
}
Expand Down Expand Up @@ -1753,7 +1753,7 @@ void ObjectsManager::handleCityMap() {
loadZone("PLAN.ZO2");
_spritePtr = _vm->_fileManager.loadFile("VOITURE.SPR");
_vm->_animationManager.loadAnim("PLAN");
_vm->_graphicsManager.VISU_ALL();
_vm->_graphicsManager.displayAllBob();
_vm->_graphicsManager.initScreen("PLAN", 2, false);
for (int i = 0; i <= 15; i++)
_vm->_globals.B_CACHE_OFF(i);
Expand Down Expand Up @@ -2063,7 +2063,7 @@ void ObjectsManager::PARADISE() {
*/
void ObjectsManager::clearScreen() {
clearSprite();
_vm->_graphicsManager.FIN_VISU();
_vm->_graphicsManager.endDisplayBob();
_vm->_fontManager.hideText(5);
_vm->_fontManager.hideText(9);
_vm->_globals.CLEAR_VBOB();
Expand Down Expand Up @@ -2098,7 +2098,9 @@ void ObjectsManager::clearScreen() {
}

/**
* Change character Face / Head
* Change the currently active player face / Head
* @param oldCharacter Previously played character
* @param newCharacter New character to play
*/
void ObjectsManager::changeCharacterHead(PlayerCharacter oldCharacter, PlayerCharacter newCharacter) {
CharacterLocation *loc;
Expand Down Expand Up @@ -3654,10 +3656,10 @@ void ObjectsManager::handleForest(int screenId, int minX, int maxX, int minY, in
_vm->_animationManager.playAnim("CREVE2.ANM", 100, 24, 500);
_vm->_globals._exitId = 150;
_vm->_graphicsManager._noFadingFl = true;
BOB_OFF(1);
BOB_OFF(2);
BOB_OFF(3);
BOB_OFF(4);
hideBob(1);
hideBob(2);
hideBob(3);
hideBob(4);
}
} else if (minX < getSpriteX(0)
&& maxX > getSpriteX(0)
Expand Down Expand Up @@ -3695,7 +3697,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo
loadLinkFile(linkFile);
if (!animFile.empty())
_vm->_animationManager.loadAnim(animFile);
_vm->_graphicsManager.VISU_ALL();
_vm->_graphicsManager.displayAllBob();
if (!s4.empty()) {
if (initializeScreen)
_vm->_graphicsManager.initScreen(s4, 0, initializeScreen);
Expand Down Expand Up @@ -3755,7 +3757,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo

_vm->_graphicsManager.fadeOutLong();
if (!animFile.empty())
_vm->_graphicsManager.FIN_VISU();
_vm->_graphicsManager.endDisplayBob();
if (_vm->_globals._screenId == 61)
removeSprite(0);
clearScreen();
Expand Down Expand Up @@ -3785,7 +3787,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm
loadLinkFile(linkFile);
if (!animFile.empty()) {
_vm->_animationManager.loadAnim(animFile);
_vm->_graphicsManager.VISU_ALL();
_vm->_graphicsManager.displayAllBob();
}
if (!s4.empty()) {
if (initializeScreen)
Expand Down Expand Up @@ -3903,7 +3905,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm
_twoCharactersFl = false;
}
if (!animFile.empty())
_vm->_graphicsManager.FIN_VISU();
_vm->_graphicsManager.endDisplayBob();
clearScreen();
} else {
_helicopterFl = false;
Expand Down

0 comments on commit f9f6133

Please sign in to comment.