aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/hopkins/globals.cpp4
-rw-r--r--engines/hopkins/globals.h2
-rw-r--r--engines/hopkins/graphics.cpp2
-rw-r--r--engines/hopkins/graphics.h2
-rw-r--r--engines/hopkins/hopkins.cpp32
-rw-r--r--engines/hopkins/menu.cpp26
-rw-r--r--engines/hopkins/menu.h3
-rw-r--r--engines/hopkins/objects.cpp10
-rw-r--r--engines/hopkins/script.cpp88
-rw-r--r--engines/hopkins/talk.cpp2
10 files changed, 84 insertions, 87 deletions
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index 1fc3d41082..ee96b2a0f7 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -136,7 +136,7 @@ Globals::Globals() {
nbrligne = 0;
largeur_boite = 0;
hauteur_boite = 0;
- forest = false;
+ _forestFl = false;
_objectWidth = _objectHeight = 0;
_helicopterFl = false;
_catalogPos = 0;
@@ -409,7 +409,7 @@ void Globals::clearAll() {
ADR_FICHIER_OBJ = g_PTRNUL;
FORETSPR = g_PTRNUL;
- forest = false;
+ _forestFl = false;
cache_souris = allocMemory(2500);
GESTE = g_PTRNUL;
diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index bea32c80ef..91486aa0a2 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -382,7 +382,7 @@ public:
int hauteur_boite;
int GESTE_FLAG;
byte *FORETSPR;
- bool forest;
+ bool _forestFl;
byte *COUCOU;
int16 *chemin;
byte *cache_souris;
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index 832f0c97d4..e83622ab57 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -1805,7 +1805,7 @@ Aff_Zoom_Larg_Cont1:
}
// Display Speed
-void GraphicsManager::AFFICHE_SPEED(const byte *spriteData, int xp, int yp, int spriteIndex) {
+void GraphicsManager::fastDisplay(const byte *spriteData, int xp, int yp, int spriteIndex) {
int width, height;
width = _vm->_objectsManager.getWidth(spriteData, spriteIndex);
diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h
index 2a49604c75..a4e8312ca0 100644
--- a/engines/hopkins/graphics.h
+++ b/engines/hopkins/graphics.h
@@ -165,7 +165,7 @@ public:
int zoomIn(int v, int percentage);
int zoomOut(int v, int percentage);
void Affiche_Perfect(byte *surface, const byte *srcData, int xp300, int yp300, int frameIndex, int zoom1, int zoom2, int modeFlag);
- void AFFICHE_SPEED(const byte *spriteData, int xp, int yp, int spriteIndex);
+ void fastDisplay(const byte *spriteData, int xp, int yp, int spriteIndex);
void SCOPY(const byte *surface, int x1, int y1, int width, int height, byte *destSurface, int destX, int destY);
void Copy_Mem(const byte *srcSurface, int x1, int y1, unsigned int width, int height, byte *destSurface, int destX, int destY);
void displayFont(byte *surface, const byte *spriteData, int xp, int yp, int characterIndex, int colour);
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index d228f0ca97..1da267d896 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -196,7 +196,7 @@ bool HopkinsEngine::runWin95Demo() {
_globals._exitId = 0;
if (!_globals._exitId) {
- _globals._exitId = _menuManager.MENU();
+ _globals._exitId = _menuManager.menu();
if (_globals._exitId == -1) {
_globals.PERSO = _globals.freeMemory(_globals.PERSO);
restoreSystem();
@@ -502,7 +502,7 @@ bool HopkinsEngine::runLinuxDemo() {
_globals._exitId = 0;
if (!_globals._exitId) {
- _globals._exitId = _menuManager.MENU();
+ _globals._exitId = _menuManager.menu();
if (_globals._exitId == -1) {
if (!g_system->getEventManager()->shouldQuit())
PUBQUIT();
@@ -863,7 +863,7 @@ bool HopkinsEngine::runOS2Full() {
if (_globals._exitId == 300)
_globals._exitId = 0;
if (!_globals._exitId) {
- _globals._exitId = _menuManager.MENU();
+ _globals._exitId = _menuManager.menu();
if (_globals._exitId == -1)
break;
}
@@ -1231,7 +1231,7 @@ bool HopkinsEngine::runOS2Full() {
_globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals._disableInventFl = false;
- _globals.forest = true;
+ _globals._forestFl = true;
_globals.NOSPRECRAN = true;
Common::String im = Common::String::format("IM%d", _globals._exitId);
_soundManager.WSOUND(13);
@@ -1244,7 +1244,7 @@ bool HopkinsEngine::runOS2Full() {
_globals.NOSPRECRAN = false;
if (_globals._exitId < 35 || _globals._exitId > 49 ) {
_globals.FORETSPR = _globals.freeMemory(_globals.FORETSPR);
- _globals.forest = false;
+ _globals._forestFl = false;
_soundManager.DEL_SAMPLE(1);
}
break;
@@ -1750,7 +1750,7 @@ bool HopkinsEngine::runBeOSFull() {
if (_globals._exitId == 300)
_globals._exitId = 0;
if (!_globals._exitId) {
- _globals._exitId = _menuManager.MENU();
+ _globals._exitId = _menuManager.menu();
if (_globals._exitId == -1) {
_globals.PERSO = _globals.freeMemory(_globals.PERSO);
restoreSystem();
@@ -2119,7 +2119,7 @@ bool HopkinsEngine::runBeOSFull() {
_globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals._disableInventFl = false;
- _globals.forest = true;
+ _globals._forestFl = true;
_globals.NOSPRECRAN = true;
Common::String im = Common::String::format("IM%d", _globals._exitId);
_soundManager.WSOUND(13);
@@ -2133,7 +2133,7 @@ bool HopkinsEngine::runBeOSFull() {
_globals.NOSPRECRAN = false;
if ((_globals._exitId < 35) || (_globals._exitId > 49)) {
_globals.FORETSPR = _globals.freeMemory(_globals.FORETSPR);
- _globals.forest = false;
+ _globals._forestFl = false;
_soundManager.DEL_SAMPLE(1);
}
break;
@@ -2636,7 +2636,7 @@ bool HopkinsEngine::runWin95full() {
_globals._exitId = 0;
if (!_globals._exitId) {
- _globals._exitId = _menuManager.MENU();
+ _globals._exitId = _menuManager.menu();
if (_globals._exitId == -1) {
_globals.PERSO = _globals.freeMemory(_globals.PERSO);
restoreSystem();
@@ -3007,7 +3007,7 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 40;
_globals.Max_Perso_Y = 435;
_globals._disableInventFl = false;
- _globals.forest = true;
+ _globals._forestFl = true;
_globals.NOSPRECRAN = true;
Common::String im = Common::String::format("IM%d", _globals._exitId);
_soundManager.WSOUND(13);
@@ -3020,7 +3020,7 @@ bool HopkinsEngine::runWin95full() {
_globals.NOSPRECRAN = false;
if (_globals._exitId < 35 || _globals._exitId > 49) {
_globals.FORETSPR = _globals.freeMemory(_globals.FORETSPR);
- _globals.forest = false;
+ _globals._forestFl = false;
_soundManager.DEL_SAMPLE(1);
}
break;
@@ -3515,7 +3515,7 @@ bool HopkinsEngine::runLinuxFull() {
if (_globals._exitId == 300)
_globals._exitId = 0;
if (!_globals._exitId) {
- _globals._exitId = _menuManager.MENU();
+ _globals._exitId = _menuManager.menu();
if (_globals._exitId == -1) {
_globals.PERSO = _globals.freeMemory(_globals.PERSO);
restoreSystem();
@@ -3885,7 +3885,7 @@ bool HopkinsEngine::runLinuxFull() {
_globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals._disableInventFl = false;
- _globals.forest = true;
+ _globals._forestFl = true;
_globals.NOSPRECRAN = true;
Common::String im = Common::String::format("IM%d", _globals._exitId);
_soundManager.WSOUND(13);
@@ -3898,7 +3898,7 @@ bool HopkinsEngine::runLinuxFull() {
_globals.NOSPRECRAN = false;
if (_globals._exitId < 35 || _globals._exitId > 49) {
_globals.FORETSPR = _globals.freeMemory(_globals.FORETSPR);
- _globals.forest = false;
+ _globals._forestFl = false;
_soundManager.DEL_SAMPLE(1);
}
break;
@@ -4790,7 +4790,7 @@ void HopkinsEngine::restoreSystem() {
void HopkinsEngine::PUBQUIT() {
_globals.PUBEXIT = true;
_graphicsManager.RESET_SEGMENT_VESA();
- _globals.forest = false;
+ _globals._forestFl = false;
_eventsManager._breakoutFl = false;
_globals._disableInventFl = true;
_graphicsManager.loadImage("BOX");
@@ -5761,7 +5761,7 @@ bool HopkinsEngine::displayAdultDisclaimer() {
_graphicsManager.max_x = SCREEN_WIDTH;
_graphicsManager.max_y = SCREEN_HEIGHT - 1;
_eventsManager._breakoutFl = false;
- _globals.forest = false;
+ _globals._forestFl = false;
_globals._disableInventFl = true;
_globals._exitId = 0;
diff --git a/engines/hopkins/menu.cpp b/engines/hopkins/menu.cpp
index 2252a45d06..ca23ac0263 100644
--- a/engines/hopkins/menu.cpp
+++ b/engines/hopkins/menu.cpp
@@ -41,7 +41,7 @@ void MenuManager::setParent(HopkinsEngine *vm) {
enum MenuSelection { MENU_NONE = 0, PLAY_GAME = 1, LOAD_GAME = 2, OPTIONS = 3, INTRODUCTION = 4, QUIT = 5 };
-int MenuManager::MENU() {
+int MenuManager::menu() {
byte *spriteData = NULL;
MenuSelection menuIndex;
Common::Point mousePos;
@@ -57,7 +57,7 @@ int MenuManager::MENU() {
result = 0;
while (!g_system->getEventManager()->shouldQuit()) {
- _vm->_globals.forest = false;
+ _vm->_globals._forestFl = false;
_vm->_eventsManager._breakoutFl = false;
_vm->_globals._disableInventFl = true;
_vm->_globals._exitId = 0;
@@ -166,11 +166,11 @@ int MenuManager::MENU() {
frame5Index = 1;
}
- _vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 259, frame1Index);
- _vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 291, frame2Index + 2);
- _vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 322, frame3Index + 4);
- _vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 354, frame4Index + 6);
- _vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 386, frame5Index + 8);
+ _vm->_graphicsManager.fastDisplay(spriteData, 230, 259, frame1Index);
+ _vm->_graphicsManager.fastDisplay(spriteData, 230, 291, frame2Index + 2);
+ _vm->_graphicsManager.fastDisplay(spriteData, 230, 322, frame3Index + 4);
+ _vm->_graphicsManager.fastDisplay(spriteData, 230, 354, frame4Index + 6);
+ _vm->_graphicsManager.fastDisplay(spriteData, 230, 386, frame5Index + 8);
_vm->_eventsManager.VBL();
if (_vm->_eventsManager.getMouseButton() == 1 && menuIndex != MENU_NONE)
@@ -178,7 +178,7 @@ int MenuManager::MENU() {
} while (!selectionMade);
if (menuIndex == PLAY_GAME) {
- _vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 259, 10);
+ _vm->_graphicsManager.fastDisplay(spriteData, 230, 259, 10);
_vm->_eventsManager.VBL();
_vm->_eventsManager.delay(200);
result = 1;
@@ -186,7 +186,7 @@ int MenuManager::MENU() {
if (menuIndex != LOAD_GAME)
break;
- _vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 291, 11);
+ _vm->_graphicsManager.fastDisplay(spriteData, 230, 291, 11);
_vm->_eventsManager.VBL();
_vm->_eventsManager.delay(200);
@@ -204,7 +204,7 @@ int MenuManager::MENU() {
break;
// Options menu item selected
- _vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 322, 12);
+ _vm->_graphicsManager.fastDisplay(spriteData, 230, 322, 12);
_vm->_eventsManager.VBL();
_vm->_eventsManager.delay(200);
@@ -212,7 +212,7 @@ int MenuManager::MENU() {
_vm->_dialogsManager.showOptionsDialog();
}
if (menuIndex == INTRODUCTION) {
- _vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 354, 13);
+ _vm->_graphicsManager.fastDisplay(spriteData, 230, 354, 13);
_vm->_eventsManager.VBL();
_vm->_eventsManager.delay(200);
_vm->playIntro();
@@ -220,7 +220,7 @@ int MenuManager::MENU() {
}
if ( menuIndex == QUIT) {
- _vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 386, 14);
+ _vm->_graphicsManager.fastDisplay(spriteData, 230, 386, 14);
_vm->_eventsManager.VBL();
_vm->_eventsManager.delay(200);
result = -1;
@@ -234,6 +234,4 @@ int MenuManager::MENU() {
return result;
}
-
-
} // End of namespace Hopkins
diff --git a/engines/hopkins/menu.h b/engines/hopkins/menu.h
index 5c174815ff..aeb3aa17cd 100644
--- a/engines/hopkins/menu.h
+++ b/engines/hopkins/menu.h
@@ -35,11 +35,10 @@ class MenuManager {
private:
HopkinsEngine *_vm;
- byte MenuTxt[10600];
public:
void setParent(HopkinsEngine *vm);
- int MENU();
+ int menu();
};
} // End of namespace Hopkins
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index ac8e5fc43b..2d04998d5f 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -2661,7 +2661,7 @@ LABEL_38:
_vm->_globals.GOACTION = false;
v9 = _vm->_globals.chemin;
_vm->_globals.chemin = (int16 *)g_PTRNUL;
- if (_vm->_globals.forest && ((uint16)(NUMZONE - 20) <= 1u || (uint16)(NUMZONE - 22) <= 1u)) {
+ if (_vm->_globals._forestFl && ((uint16)(NUMZONE - 20) <= 1u || (uint16)(NUMZONE - 22) <= 1u)) {
if (getSpriteY(0) <= 374 || getSpriteY(0) > 410) {
v10 = getSpriteX(0);
v11 = getSpriteY(0);
@@ -2752,7 +2752,7 @@ void ObjectsManager::PARADISE() {
result = _vm->_globals._saveData->data[svField1];
if (result && _vm->_globals._saveData->data[svField2] && result != 4 && result > 3) {
_vm->_fontManager.hideText(5);
- if (!_vm->_globals.forest || ((uint16)(NUMZONE - 20) > 1u && (uint16)(NUMZONE - 22) > 1u)) {
+ if (!_vm->_globals._forestFl || ((uint16)(NUMZONE - 20) > 1u && (uint16)(NUMZONE - 22) > 1u)) {
if (_vm->_graphicsManager.DOUBLE_ECRAN) {
_vm->_graphicsManager.no_scroll = 2;
if (_vm->_eventsManager._startPos.x >= getSpriteX(0) - 320)
@@ -4122,11 +4122,11 @@ void ObjectsManager::BOB_VIVANT(int idx) {
v4 = *(_vm->_talkManager.ADR_ANIM + 2 * v1 + 8);
if ((int16)READ_LE_UINT16(_vm->_talkManager.ADR_ANIM + 2 * v1 + 4)) {
if (!_vm->_globals.NO_OFFSET)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_talkManager._characterSprite,
+ _vm->_graphicsManager.fastDisplay(_vm->_talkManager._characterSprite,
_vm->_graphicsManager.ofscroll + v2, v3,
*(_vm->_talkManager.ADR_ANIM + 2 * v1 + 8));
if (_vm->_globals.NO_OFFSET)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_talkManager._characterSprite, v2, v3, v4);
+ _vm->_graphicsManager.fastDisplay(_vm->_talkManager._characterSprite, v2, v3, v4);
}
}
@@ -4369,7 +4369,7 @@ void ObjectsManager::OPTI_ONE(int idx, int fromPosi, int destPosi, int a4) {
if (!a4)
stopBobAnimation(idx);
else if (a4 == 4) {
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals._bob[idx]._spriteData,
+ _vm->_graphicsManager.fastDisplay(_vm->_globals._bob[idx]._spriteData,
_vm->_globals._bob[idx]._oldX, _vm->_globals._bob[idx]._oldY, _vm->_globals._bob[idx]._frameIndex);
stopBobAnimation(idx);
_vm->_eventsManager.VBL();
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index a3dfa3a746..7a336d00f0 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -171,7 +171,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
int v68 = (int16)READ_LE_UINT16(dataP + 8);
int v66 = (int16)READ_LE_UINT16(dataP + 10);
if (v72 == 52) {
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, v68, (int16)READ_LE_UINT16(dataP + 10), v70);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, v68, (int16)READ_LE_UINT16(dataP + 10), v70);
} else if (v72 == 51) {
_vm->_objectsManager.BOB_VIVANT(v70);
} else {
@@ -800,11 +800,11 @@ LABEL_1141:
if (_vm->_objectsManager.BOBPOSI(10) == 34)
v15 = false;
if (_vm->_objectsManager.BOBPOSI(10) == 12)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 249, 1);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 249, 1);
if (_vm->_objectsManager.BOBPOSI(10) == 23)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 249, 2);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 249, 2);
if (_vm->_objectsManager.BOBPOSI(10) == 34)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 249, 3);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 249, 3);
_vm->_eventsManager.VBL();
} while (_vm->_objectsManager.BOBPOSI(9) != 36);
_vm->_objectsManager.SPRITE_ON(0);
@@ -1098,7 +1098,7 @@ LABEL_1141:
v24 = 0;
_vm->_eventsManager.VBL();
} while (_vm->_objectsManager.BOBPOSI(8) != 32);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 201, 14, 1);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 201, 14, 1);
_vm->_objectsManager.SPRITE_ON(0);
_vm->_objectsManager.stopBobAnimation(11);
_vm->_objectsManager.stopBobAnimation(8);
@@ -1204,7 +1204,7 @@ LABEL_1141:
} while (_vm->_objectsManager.BOBPOSI(1) != 9);
_vm->_objectsManager.stopBobAnimation(1);
_vm->_objectsManager.stopBobAnimation(2);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 283, 160, 6);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 283, 160, 6);
_vm->_soundManager.DEL_SAMPLE(1);
}
if (_vm->_globals._saveData->data[svField183] == 2) {
@@ -1246,7 +1246,7 @@ LABEL_1141:
} while (_vm->_objectsManager.BOBPOSI(1) != 9);
_vm->_objectsManager.stopBobAnimation(1);
_vm->_objectsManager.stopBobAnimation(3);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 283, 161, 8);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 283, 161, 8);
_vm->_soundManager.DEL_SAMPLE(1);
}
break;
@@ -1255,12 +1255,12 @@ LABEL_1141:
_vm->_soundManager.PLAY_SOUND("SOUND52.WAV");
if (!_vm->_globals._saveData->data[svField186]) {
_vm->_animationManager.playSequence("CIB5A.SEQ", 1, 12, 1);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 155, 29, 0);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 155, 29, 0);
}
if (_vm->_globals._saveData->data[svField186] == 1) {
_vm->_animationManager.playSequence("CIB5C.SEQ", 1, 12, 1);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 155, 29, 0);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 329, 87, 2);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 155, 29, 0);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 329, 87, 2);
}
break;
@@ -1268,12 +1268,12 @@ LABEL_1141:
_vm->_soundManager.PLAY_SOUND("SOUND52.WAV");
if (!_vm->_globals._saveData->data[svField186]) {
_vm->_animationManager.playSequence("CIB5B.SEQ", 1, 12, 1);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 155, 29, 5);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 155, 29, 5);
}
if (_vm->_globals._saveData->data[svField186] == 1) {
_vm->_animationManager.playSequence("CIB5D.SEQ", 1, 12, 1);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 155, 29, 5);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 283, 160, 6);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 155, 29, 5);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 283, 160, 6);
}
break;
@@ -1281,12 +1281,12 @@ LABEL_1141:
_vm->_soundManager.PLAY_SOUND("SOUND52.WAV");
if (!_vm->_globals._saveData->data[svField184]) {
_vm->_animationManager.playSequence("CIB6A.SEQ", 1, 12, 1);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 155, 29, 0);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 155, 29, 0);
}
if (_vm->_globals._saveData->data[svField184] == 1) {
_vm->_animationManager.playSequence("CIB6C.SEQ", 1, 12, 1);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 155, 29, 0);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 293, 139, 3);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 155, 29, 0);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 293, 139, 3);
}
break;
@@ -1294,12 +1294,12 @@ LABEL_1141:
_vm->_soundManager.PLAY_SOUND("SOUND52.WAV");
if (!_vm->_globals._saveData->data[svField184]) {
_vm->_animationManager.playSequence("CIB6B.SEQ", 1, 12, 1);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 155, 29, 5);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 155, 29, 5);
}
if (_vm->_globals._saveData->data[svField184] == 1) {
_vm->_animationManager.playSequence("CIB6D.SEQ", 1, 12, 1);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 155, 29, 5);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 283, 161, 8);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 155, 29, 5);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 283, 161, 8);
}
break;
@@ -1333,7 +1333,7 @@ LABEL_1141:
_vm->_eventsManager.VBL();
} while (_vm->_objectsManager.BOBPOSI(12) != 117);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 830, 122, 0);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 830, 122, 0);
_vm->_objectsManager.stopBobAnimation(12);
_vm->_objectsManager.stopBobAnimation(10);
_vm->_objectsManager.setBobAnimation(11);
@@ -1778,7 +1778,7 @@ LABEL_1141:
_vm->_eventsManager.VBL();
if (_vm->_objectsManager.BOBPOSI(4) == 18)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 18, 334, 0);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 18, 334, 0);
} while (_vm->_objectsManager.BOBPOSI(4) != 26);
_vm->_objectsManager.stopBobAnimation(4);
_vm->_globals.NO_VISU = false;
@@ -1909,7 +1909,7 @@ LABEL_1141:
_vm->_soundManager.SPECIAL_SOUND = 210;
_vm->_animationManager.playSequence2("SECRET1.SEQ", 1, 12, 1);
_vm->_soundManager.SPECIAL_SOUND = 0;
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 192, 152, 0);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 192, 152, 0);
_vm->_objectsManager.setBobAnimation(9);
_vm->_objectsManager.OBSSEUL = 1;
_vm->_objectsManager.INILINK("IM73a");
@@ -1965,7 +1965,7 @@ LABEL_1141:
_vm->_soundManager.SPECIAL_SOUND = 229;
_vm->_animationManager.playSequence("MUR.SEQ", 1, 12, 1);
_vm->_soundManager.SPECIAL_SOUND = 0;
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 340, 157, 2);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 340, 157, 2);
break;
case 230: {
@@ -2007,7 +2007,7 @@ LABEL_1141:
_vm->_objectsManager.setSpriteX(0, 476);
_vm->_objectsManager.setSpriteY(0, 278);
_vm->_objectsManager.SPRITE_ON(0);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 337, 154, 3);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 337, 154, 3);
_vm->_objectsManager.OBSSEUL = 1;
_vm->_objectsManager.INILINK("IM93c");
_vm->_objectsManager.OBSSEUL = 0;
@@ -2083,11 +2083,11 @@ LABEL_1141:
_vm->_soundManager.PLAY_SOUND("SOUND83.WAV");
_vm->_objectsManager.OPTI_ONE(v70, 26, 50, 0);
if (_vm->_globals._saveData->data[svField341] == 1)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 27, 117, 0);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 27, 117, 0);
if (_vm->_globals._saveData->data[svField341] == 2)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 145, 166, 2);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 145, 166, 2);
if (_vm->_globals._saveData->data[svField341] == 3)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 296, 212, 4);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 296, 212, 4);
if (_vm->_globals._saveData->data[svField341] == 1)
_vm->_globals._saveData->data[svField338] = 0;
if (_vm->_globals._saveData->data[svField341] == 2)
@@ -2097,7 +2097,7 @@ LABEL_1141:
}
_vm->_soundManager.PLAY_SOUND("SOUND83.WAV");
_vm->_objectsManager.OPTI_ONE(6, 0, 23, 0);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 27, 117, 1);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 27, 117, 1);
break;
}
@@ -2113,11 +2113,11 @@ LABEL_1141:
_vm->_soundManager.PLAY_SOUND("SOUND83.WAV");
_vm->_objectsManager.OPTI_ONE(v70, 26, 50, 0);
if (_vm->_globals._saveData->data[svField341] == 1)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 27, 117, 0);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 27, 117, 0);
if (_vm->_globals._saveData->data[svField341] == 2)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 145, 166, 2);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 145, 166, 2);
if (_vm->_globals._saveData->data[svField341] == 3)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 296, 212, 4);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 296, 212, 4);
if (_vm->_globals._saveData->data[svField341] == 1)
_vm->_globals._saveData->data[svField338] = 0;
if (_vm->_globals._saveData->data[svField341] == 2)
@@ -2127,7 +2127,7 @@ LABEL_1141:
}
_vm->_soundManager.PLAY_SOUND("SOUND83.WAV");
_vm->_objectsManager.OPTI_ONE(5, 0, 23, 0);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 145, 166, 3);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 145, 166, 3);
break;
}
@@ -2143,11 +2143,11 @@ LABEL_1141:
_vm->_soundManager.PLAY_SOUND("SOUND83.WAV");
_vm->_objectsManager.OPTI_ONE(v70, 26, 50, 0);
if (_vm->_globals._saveData->data[svField341] == 1)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 27, 117, 0);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 27, 117, 0);
if (_vm->_globals._saveData->data[svField341] == 2)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 145, 166, 2);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 145, 166, 2);
if (_vm->_globals._saveData->data[svField341] == 3)
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 296, 212, 4);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 296, 212, 4);
if (_vm->_globals._saveData->data[svField341] == 1)
_vm->_globals._saveData->data[svField338] = 0;
if (_vm->_globals._saveData->data[svField341] == 2)
@@ -2157,7 +2157,7 @@ LABEL_1141:
}
_vm->_soundManager.PLAY_SOUND("SOUND83.WAV");
_vm->_objectsManager.OPTI_ONE(4, 0, 23, 0);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 296, 212, 5);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 296, 212, 5);
break;
}
@@ -2239,7 +2239,7 @@ LABEL_1141:
_vm->_globals._saveData->data[svField356] = 0;
_vm->_globals._saveData->data[svField355] = 1;
_vm->_objectsManager._twoCharactersFl = true;
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 373, 191, 3);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 373, 191, 3);
_vm->_objectsManager.SPRITE(_vm->_globals.TETE, v53->_pos, 1, 3, v53->field4, 0, 20, 127);
_vm->_objectsManager.SPRITE_ON(1);
break;
@@ -2261,7 +2261,7 @@ LABEL_1141:
_vm->_objectsManager.OPTI_ONE(5, 0, 6, 0);
_vm->_globals.ZONEP[4]._destX = 276;
_vm->_objectsManager.VERBE_ON(4, 19);
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 285, 379, 0);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 285, 379, 0);
_vm->_globals._saveData->data[svField399] = 1;
break;
@@ -2299,21 +2299,21 @@ LABEL_1141:
case 601:
_vm->_globals.NO_VISU = true;
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
_vm->_globals.NO_VISU = false;
_vm->_objectsManager.OPTI_ONE(2, 0, 16, 4);
break;
case 602:
_vm->_globals.NO_VISU = true;
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
_vm->_globals.NO_VISU = false;
_vm->_objectsManager.OPTI_ONE(4, 0, 16, 4);
break;
case 603:
_vm->_globals.NO_VISU = true;
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
_vm->_globals.NO_VISU = false;
_vm->_objectsManager.OPTI_ONE(3, 0, 16, 4);
_vm->_soundManager.SPECIAL_SOUND = 199;
@@ -2330,7 +2330,7 @@ LABEL_1141:
case 604:
_vm->_globals.NO_VISU = true;
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
_vm->_globals.NO_VISU = false;
_vm->_objectsManager.OPTI_ONE(1, 0, 16, 4);
_vm->_soundManager.SPECIAL_SOUND = 199;
@@ -2346,7 +2346,7 @@ LABEL_1141:
case 605:
_vm->_globals.NO_VISU = true;
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
_vm->_globals.NO_VISU = false;
_vm->_objectsManager.OPTI_ONE(5, 0, 16, 4);
_vm->_graphicsManager.FADE_OUTS();
@@ -2364,7 +2364,7 @@ LABEL_1141:
case 606:
_vm->_globals.NO_VISU = true;
- _vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
+ _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
_vm->_globals.NO_VISU = false;
_vm->_objectsManager.OPTI_ONE(6, 0, 16, 4);
if ((_vm->getPlatform() != Common::kPlatformWindows) || !_vm->getIsDemo()) {
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index 339646a491..0209f0f737 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -777,7 +777,7 @@ void TalkManager::CHERCHE_ANIM0(int a1, int a2) {
do {
v7 = (int16)READ_LE_UINT16(&v8[2 * v6 + 4]);
if (v7 && _vm->_globals._speed != 501)
- _vm->_graphicsManager.AFFICHE_SPEED(_characterSprite, _vm->_eventsManager._startPos.x + (int16)READ_LE_UINT16(&v8[2 * v6]),
+ _vm->_graphicsManager.fastDisplay(_characterSprite, _vm->_eventsManager._startPos.x + (int16)READ_LE_UINT16(&v8[2 * v6]),
(int16)READ_LE_UINT16(&v8[2 * v6 + 2]), v9[2 * v6 + 8]);
v6 += 5;
} while (_vm->_globals._speed != 501 && v7);
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-22 02:44:30 +0000