aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2012-10-28 22:38:34 +0100
committerStrangerke2012-10-28 22:38:34 +0100
commit9d18e3fa59658a58e46deba75a0a231389ffd2f6 (patch)
tree419587bb783c610c718695049bbba60e9b3afc38 /engines
parent5faf827f151e714a885b756ff20a8b6e9818b104 (diff)
downloadscummvm-rg350-9d18e3fa59658a58e46deba75a0a231389ffd2f6.tar.gz
scummvm-rg350-9d18e3fa59658a58e46deba75a0a231389ffd2f6.tar.bz2
scummvm-rg350-9d18e3fa59658a58e46deba75a0a231389ffd2f6.zip
HOPKINS: Replace some 0/1 by false/true for boolean variables
Diffstat (limited to 'engines')
-rw-r--r--engines/hopkins/anim.cpp18
-rw-r--r--engines/hopkins/dialogs.cpp4
-rw-r--r--engines/hopkins/events.cpp8
-rw-r--r--engines/hopkins/globals.cpp6
-rw-r--r--engines/hopkins/graphics.cpp12
-rw-r--r--engines/hopkins/hopkins.cpp27
-rw-r--r--engines/hopkins/menu.cpp10
-rw-r--r--engines/hopkins/objects.cpp84
-rw-r--r--engines/hopkins/script.cpp136
-rw-r--r--engines/hopkins/talk.cpp33
10 files changed, 170 insertions, 168 deletions
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index 2a85257d6a..661c1762c1 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -103,14 +103,14 @@ LABEL_2:
_vm->_graphicsManager.DD_VBL();
}
_vm->_eventsManager.lItCounter = 0;
- _vm->_eventsManager.ESC_KEY = 0;
+ _vm->_eventsManager.ESC_KEY = false;
_vm->_soundManager.LOAD_ANM_SOUND();
if (_vm->_globals.iRegul != 1)
break;
while (!_vm->shouldQuit()) {
- if (_vm->_eventsManager.ESC_KEY == 1)
+ if (_vm->_eventsManager.ESC_KEY == true)
goto LABEL_58;
- if (REDRAW_ANIM() == 1)
+ if (REDRAW_ANIM() == true)
break;
_vm->_eventsManager.CONTROLE_MES();
if (_vm->_eventsManager.lItCounter >= rate1)
@@ -168,8 +168,8 @@ LABEL_38:
LABEL_49:
if (v4 == -1) {
if (_vm->_globals.iRegul == 1) {
- while (_vm->_eventsManager.ESC_KEY != 1) {
- if (REDRAW_ANIM() == 1)
+ while (_vm->_eventsManager.ESC_KEY != true) {
+ if (REDRAW_ANIM() == true)
goto LABEL_53;
_vm->_eventsManager.CONTROLE_MES();
_vm->_soundManager.VERIF_SOUND();
@@ -983,7 +983,7 @@ void AnimationManager::PLAY_SEQ(int a1, const Common::String &a2, uint32 a3, uin
v16 = 0;
v15 = 0;
v17 = 1;
- _vm->_eventsManager.souris_flag = 0;
+ _vm->_eventsManager.souris_flag = false;
if (!NO_COUL) {
_vm->_eventsManager.VBL();
@@ -1120,7 +1120,7 @@ LABEL_59:
_vm->_fileManager.bload("TEMP.SCR", _vm->_graphicsManager.VESA_SCREEN);
g_system->getSavefileManager()->removeSavefile("TEMP.SCR");
- _vm->_eventsManager.souris_flag = 1;
+ _vm->_eventsManager.souris_flag = true;
}
if (v7 == 1)
_vm->_globals.dos_free2(ptr);
@@ -1155,7 +1155,7 @@ void AnimationManager::PLAY_SEQ2(const Common::String &a1, uint32 a2, uint32 a3,
v17 = 0;
v16 = 0;
v18 = 1;
- _vm->_eventsManager.souris_flag = 0;
+ _vm->_eventsManager.souris_flag = false;
v10 = _vm->_graphicsManager.VESA_SCREEN;
v11 = _vm->_globals.dos_malloc2(0x16u);
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPSEQ, a1);
@@ -1334,7 +1334,7 @@ LABEL_54:
f.close();
_vm->_globals.dos_free2(v11);
- _vm->_eventsManager.souris_flag = 1;
+ _vm->_eventsManager.souris_flag = true;
}
} // End of namespace Hopkins
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
index 9285ae6a81..28baa319e7 100644
--- a/engines/hopkins/dialogs.cpp
+++ b/engines/hopkins/dialogs.cpp
@@ -318,7 +318,7 @@ void DialogsManager::showInventory() {
LABEL_7:
_vm->_eventsManager.souris_bb = 0;
_vm->_eventsManager.souris_b = 0;
- _vm->_globals.DESACTIVE_INVENT = 1;
+ _vm->_globals.DESACTIVE_INVENT = true;
_vm->_graphicsManager.SETCOLOR4(251, 100, 100, 100);
switch (_vm->_globals.FR) {
@@ -470,7 +470,7 @@ LABEL_7:
_vm->_objectsManager.cady = 0;
_vm->_objectsManager.old_cadx = 0;
_vm->_objectsManager.cadx = 0;
- _vm->_globals.DESACTIVE_INVENT = 0;
+ _vm->_globals.DESACTIVE_INVENT = false;
_vm->_graphicsManager.no_scroll = 0;
}
}
diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
index dbdd0fce81..dc667d5d28 100644
--- a/engines/hopkins/events.cpp
+++ b/engines/hopkins/events.cpp
@@ -310,7 +310,7 @@ void EventsManager::VBL() {
}
_vm->_graphicsManager.DD_Unlock();
}
- if (souris_flag == 1) {
+ if (souris_flag == true) {
v1 = 20;
if (!mouse_linux)
v1 = 10;
@@ -356,7 +356,7 @@ LABEL_34:
LABEL_35:
if (!_vm->_globals.PUBEXIT)
_vm->_objectsManager.AFF_SPRITES();
- if (souris_flag != 1)
+ if (souris_flag != true)
goto LABEL_54;
if (btsouris == 23)
goto LABEL_45;
@@ -392,7 +392,7 @@ LABEL_54:
checkForNextFrameCounter();
while (CASSE || _vm->_globals.iRegul != 1) {
- if (CASSE != 1)
+ if (CASSE != true)
goto LABEL_63;
if (lItCounter > 1)
goto LABEL_65;
@@ -474,7 +474,7 @@ LABEL_65:
}
souris_bb = souris_b;
souris_b = 0;
- if (souris_flag == 1) {
+ if (souris_flag == true) {
if (btsouris != 23) {
if (yp < _vm->_graphicsManager.max_y && v15 < _vm->_graphicsManager.max_x && v14 > 1 && v13 > 1) {
/* Commented out in favour of using ScummVM cursor display
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index a25f962949..6809faa0d6 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -508,16 +508,16 @@ void Globals::RESET_CACHE() {
Cache[idx].field14 = 0;
}
- CACHEFLAG = 0;
+ CACHEFLAG = false;
}
void Globals::CACHE_ON() {
- CACHEFLAG = 1;
+ CACHEFLAG = true;
}
// TODO: Find why some calls have a parameter value
void Globals::CACHE_OFF(int v1) {
- CACHEFLAG = 0;
+ CACHEFLAG = false;
}
void Globals::CACHE_SUB(int idx) {
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index 519c193235..f24955b9ec 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -104,9 +104,9 @@ void GraphicsManager::SET_MODE(int width, int height) {
SDL_ECHELLE = _vm->_globals.XZOOM;
int bpp = 8;
- if (_vm->_globals.XFORCE8 == 1)
+ if (_vm->_globals.XFORCE8 == true)
bpp = 8;
- if (_vm->_globals.XFORCE16 == 1)
+ if (_vm->_globals.XFORCE16 == true)
bpp = 16;
if (SDL_ECHELLE) {
@@ -1547,7 +1547,7 @@ void GraphicsManager::Affiche_Segment_Vesa() {
if (bloc.field0 != 1)
continue;
- if (_vm->_eventsManager.CASSE != 0) {
+ if (_vm->_eventsManager.CASSE != false) {
if (Winbpp == 1) {
Copy_Vga(VESA_BUFFER, bloc.x1, bloc.y1, bloc.x2 - bloc.x1, bloc.y2 - bloc.y1, bloc.x1, bloc.y1);
} else if (Winbpp == 2) {
@@ -2311,14 +2311,14 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int a2) {
if (!_vm->_globals.NOSPRECRAN) {
_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.RECHERCHE_CAT(v13, 8);
if (_vm->_globals.SPRITE_ECRAN) {
- _vm->_globals.CAT_FLAG = 0;
+ _vm->_globals.CAT_FLAG = false;
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, v13);
} else {
- _vm->_globals.CAT_FLAG = 1;
+ _vm->_globals.CAT_FLAG = true;
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_SLI.RES");
}
_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.CHARGE_FICHIER(_vm->_globals.NFICHIER);
- _vm->_globals.CAT_FLAG = 0;
+ _vm->_globals.CAT_FLAG = false;
}
}
if (*ptr != 'I' || *(ptr + 1) != 'N' || *(ptr + 2) != 'I') {
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 2929161c68..e3fe6e99c5 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -555,11 +555,14 @@ void HopkinsEngine::INIT_SYSTEM() {
case 0:
if (!_eventsManager.mouse_linux)
_fileManager.CONSTRUIT_SYSTEM("SOUAN.SPR");
- if (!_globals.FR && _eventsManager.mouse_linux)
+ else
_fileManager.CONSTRUIT_SYSTEM("LSOUAN.SPR");
break;
case 1:
- _fileManager.CONSTRUIT_SYSTEM("LSOUFR.SPR");
+ if (!_eventsManager.mouse_linux)
+ _fileManager.CONSTRUIT_SYSTEM("SOUFR.SPR");
+ else
+ _fileManager.CONSTRUIT_SYSTEM("LSOUFR.SPR");
break;
case 2:
_fileManager.CONSTRUIT_SYSTEM("SOUES.SPR");
@@ -639,7 +642,7 @@ void HopkinsEngine::INTRORUN() {
memset(&paletteData, 0, PALETTE_EXT_BLOCK_SIZE);
_eventsManager.VBL();
- _eventsManager.souris_flag = 0;
+ _eventsManager.souris_flag = false;
_globals.iRegul = 1;
_eventsManager.VBL();
_soundManager.WSOUND(16);
@@ -668,14 +671,14 @@ void HopkinsEngine::INTRORUN() {
_graphicsManager.SETCOLOR3(253, 100, 100, 100);
_graphicsManager.SETCOLOR3(251, 100, 100, 100);
_graphicsManager.SETCOLOR3(254, 0, 0, 0);
- _globals.BPP_NOAFF = 1;
+ _globals.BPP_NOAFF = true;
v2 = 0;
do {
_eventsManager.VBL();
++v2;
} while (v2 <= 4);
- _globals.BPP_NOAFF = 0;
+ _globals.BPP_NOAFF = false;
_globals.iRegul = 1;
_graphicsManager.FADE_INW();
if (_graphicsManager.DOUBLE_ECRAN == 1) {
@@ -719,7 +722,7 @@ void HopkinsEngine::INTRORUN() {
_graphicsManager.SETCOLOR3(253, 100, 100, 100);
_graphicsManager.SETCOLOR3(251, 100, 100, 100);
_graphicsManager.SETCOLOR3(254, 0, 0, 0);
- _globals.BPP_NOAFF = 1;
+ _globals.BPP_NOAFF = true;
v5 = 0;
do {
@@ -727,7 +730,7 @@ void HopkinsEngine::INTRORUN() {
++v5;
} while (v5 <= 4);
- _globals.BPP_NOAFF = 0;
+ _globals.BPP_NOAFF = false;
_globals.iRegul = 1;
_graphicsManager.FADE_INW();
for (i = 0; i < 200 / _globals.vitesse; ++i)
@@ -769,7 +772,7 @@ void HopkinsEngine::INTRORUN() {
_graphicsManager.SETCOLOR3(253, 100, 100, 100);
_graphicsManager.SETCOLOR3(251, 100, 100, 100);
_graphicsManager.SETCOLOR3(254, 0, 0, 0);
- _globals.BPP_NOAFF = 1;
+ _globals.BPP_NOAFF = true;
v8 = 0;
do {
@@ -777,7 +780,7 @@ void HopkinsEngine::INTRORUN() {
++v8;
} while (v8 <= 3);
- _globals.BPP_NOAFF = 0;
+ _globals.BPP_NOAFF = false;
_globals.iRegul = 1;
_graphicsManager.setpal_vga256_linux(paletteData2, _graphicsManager.VESA_BUFFER);
v9 = 0;
@@ -942,13 +945,13 @@ void HopkinsEngine::BOOM() {
_animationManager.CHARGE_ANIM("ANIM15");
_graphicsManager.VISU_ALL();
_objectsManager.BOBANIM_OFF(7);
- _globals.BPP_NOAFF = 1;
+ _globals.BPP_NOAFF = true;
for (int idx = 0; idx < 5; ++idx) {
_eventsManager.VBL();
}
- _globals.BPP_NOAFF = 0;
+ _globals.BPP_NOAFF = false;
_graphicsManager.FADE_INW();
_eventsManager.MOUSE_OFF();
@@ -980,7 +983,7 @@ void HopkinsEngine::PUBQUIT() {
_globals.PUBEXIT = 1;
_graphicsManager.RESET_SEGMENT_VESA();
_globals.FORET = 0;
- _eventsManager.CASSE = 0;
+ _eventsManager.CASSE = false;
_globals.DESACTIVE_INVENT = true;
_globals.FLAG_VISIBLE = false;
_graphicsManager.LOAD_IMAGE("BOX");
diff --git a/engines/hopkins/menu.cpp b/engines/hopkins/menu.cpp
index 8722b9e5d8..b657d83fc5 100644
--- a/engines/hopkins/menu.cpp
+++ b/engines/hopkins/menu.cpp
@@ -55,9 +55,9 @@ int MenuManager::MENU() {
v6 = 0;
while (!g_system->getEventManager()->shouldQuit()) {
_vm->_globals.FORET = 0;
- _vm->_eventsManager.CASSE = 0;
- _vm->_globals.DESACTIVE_INVENT = 1;
- _vm->_globals.FLAG_VISIBLE = 0;
+ _vm->_eventsManager.CASSE = false;
+ _vm->_globals.DESACTIVE_INVENT = true;
+ _vm->_globals.FLAG_VISIBLE = false;
_vm->_globals.SORTIE = 0;
for (int idx = 0; idx < 31; ++idx)
@@ -227,8 +227,8 @@ int MenuManager::MENU() {
}
_vm->_globals.LIBERE_FICHIER(spriteData);
- _vm->_globals.DESACTIVE_INVENT = 0;
- _vm->_globals.FLAG_VISIBLE = 0;
+ _vm->_globals.DESACTIVE_INVENT = false;
+ _vm->_globals.FLAG_VISIBLE = false;
_vm->_graphicsManager.FADE_OUTW();
return v6;
}
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index 0b3fe161c0..a611517d1f 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -1780,14 +1780,14 @@ LABEL_54:
_vm->_globals.old_x_69 = v0;
_vm->_globals.old_y_70 = v2;
_vm->_globals.old_zone_68 = v4;
- if (_vm->_globals.NOMARCHE == 1) {
+ if (_vm->_globals.NOMARCHE == true) {
if (_vm->_eventsManager.btsouris == 4) {
v1 = v4 + 1;
if ((uint16)(v4 + 1) > 1u)
BTDROITE();
}
}
- if ((_vm->_globals.PLAN_FLAG == 1 && v4 == -1) || !v4) {
+ if ((_vm->_globals.PLAN_FLAG == true && v4 == -1) || !v4) {
verbe = 0;
_vm->_eventsManager.btsouris = 0;
_vm->_eventsManager.CHANGE_MOUSE(0);
@@ -2628,9 +2628,9 @@ void ObjectsManager::PLAN_BETA() {
_vm->_globals.Max_Propre_Gen = 1;
_vm->_globals.Max_Perso_Y = 440;
_vm->_globals.NOSPRECRAN = 1;
- _vm->_globals.PLAN_FLAG = 1;
+ _vm->_globals.PLAN_FLAG = true;
_vm->_graphicsManager.NOFADE = false;
- _vm->_globals.NOMARCHE = 0;
+ _vm->_globals.NOMARCHE = false;
sprite_ptr = g_PTRNUL;
_vm->_globals.SORTIE = 0;
_vm->_globals.AFFLI = 0;
@@ -2673,7 +2673,7 @@ void ObjectsManager::PLAN_BETA() {
_vm->_graphicsManager.SETCOLOR3(253, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(251, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0);
- _vm->_globals.BPP_NOAFF = 1;
+ _vm->_globals.BPP_NOAFF = true;
v4 = 0;
do {
@@ -2681,7 +2681,7 @@ void ObjectsManager::PLAN_BETA() {
++v4;
} while (v4 <= 4);
- _vm->_globals.BPP_NOAFF = 0;
+ _vm->_globals.BPP_NOAFF = false;
_vm->_globals.iRegul = 1;
_vm->_graphicsManager.FADE_INW();
_vm->_eventsManager.CHANGE_MOUSE(4);
@@ -2699,9 +2699,9 @@ void ObjectsManager::PLAN_BETA() {
}
if (_vm->_globals.SAUVEGARDE->data[svField180] == 1 && !_vm->_globals.SAUVEGARDE->data[svField172]) {
_vm->_globals.SAUVEGARDE->data[svField172] = 1;
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("APPEL2.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
v5 = 0;
_vm->_eventsManager.souris_bb = false;
}
@@ -2732,7 +2732,7 @@ void ObjectsManager::PLAN_BETA() {
sprite_ptr = _vm->_globals.LIBERE_FICHIER(sprite_ptr);
CLEAR_ECRAN();
_vm->_globals.NOSPRECRAN = 0;
- _vm->_globals.PLAN_FLAG = 0;
+ _vm->_globals.PLAN_FLAG = false;
}
// Left Button
@@ -2802,7 +2802,7 @@ void ObjectsManager::BTGAUCHE() {
return;
}
}
- if (_vm->_globals.PLAN_FLAG == 1) {
+ if (_vm->_globals.PLAN_FLAG == true) {
if (_vm->_globals.GOACTION != 1)
goto LABEL_38;
VERIFZONE();
@@ -2829,7 +2829,7 @@ void ObjectsManager::BTGAUCHE() {
_vm->_globals.SAUVEGARDE->data[svField2] = 0;
}
LABEL_38:
- if (_vm->_globals.PLAN_FLAG == 1 && (_vm->_eventsManager.btsouris != 4 || NUMZONE <= 0))
+ if (_vm->_globals.PLAN_FLAG == true && (_vm->_eventsManager.btsouris != 4 || NUMZONE <= 0))
return;
if ((uint16)(NUMZONE + 1) > 1u) {
zoneCount = NUMZONE;
@@ -2893,7 +2893,7 @@ LABEL_63:
_vm->_globals.chemin = v9;
}
LABEL_65:
- if (!_vm->_globals.NOMARCHE && _vm->_globals.PLAN_FLAG == 1) {
+ if (!_vm->_globals.NOMARCHE && _vm->_globals.PLAN_FLAG == true) {
v17 = YSPR(0);
v18 = XSPR(0);
_vm->_globals.chemin = PARC_VOITURE(v18, v17, destX, destY);
@@ -2903,7 +2903,7 @@ LABEL_65:
// TODO: Reformat the weird if statement generated by the decompiler
if (_vm->_eventsManager.btsouris == 23 || (_vm->_globals.SAUVEGARDE->data[svField1] = _vm->_eventsManager.btsouris, _vm->_eventsManager.btsouris == 23))
_vm->_globals.SAUVEGARDE->data[svField1] = 5;
- if (_vm->_globals.PLAN_FLAG == 1)
+ if (_vm->_globals.PLAN_FLAG == true)
_vm->_globals.SAUVEGARDE->data[svField1] = 6;
_vm->_globals.SAUVEGARDE->data[svField2] = NUMZONE;
_vm->_globals.SAUVEGARDE->data[svField3] = _vm->_globals.OBJET_EN_COURS;
@@ -3024,11 +3024,11 @@ LABEL_64:
_vm->_globals.SAUVEGARDE->data[svField1] = 0;
_vm->_globals.SAUVEGARDE->data[svField2] = 0;
}
- if (_vm->_globals.PLAN_FLAG == 1) {
+ if (_vm->_globals.PLAN_FLAG == true) {
_vm->_eventsManager.btsouris = 0;
_vm->_eventsManager.CHANGE_MOUSE(0);
}
- if (_vm->_globals.NOMARCHE == 1) {
+ if (_vm->_globals.NOMARCHE == true) {
if (_vm->_eventsManager.btsouris == 4) {
result = NUMZONE + 1;
if ((uint16)(NUMZONE + 1) > 1u)
@@ -4261,9 +4261,9 @@ void ObjectsManager::SPECIAL_JEU() {
if (YSPR(0) <= 399) {
if (!_vm->_globals.SAUVEGARDE->data[svField173]) {
_vm->_globals.SAUVEGARDE->data[svField173] = 1;
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("flicspe1.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
if (!_vm->_globals.CENSURE) {
v1 = _vm->_globals.dos_malloc2(0x3E8u);
memcpy(v1, _vm->_graphicsManager.Palette, 0x301u);
@@ -4326,7 +4326,7 @@ void ObjectsManager::SPECIAL_JEU() {
&& YSPR(0) > 372
&& YSPR(0) <= 398;
if (_vm->_globals.ECRAN == 57) {
- _vm->_globals.DESACTIVE_INVENT = 1;
+ _vm->_globals.DESACTIVE_INVENT = true;
if (_vm->_globals.SAUVEGARDE->data[svField261] == 1 && BOBPOSI(5) == 37) {
BOBANIM_OFF(5);
SET_BOBPOSI(5, 0);
@@ -4342,18 +4342,18 @@ void ObjectsManager::SPECIAL_JEU() {
ZONE_ON(14);
_vm->_globals.SAUVEGARDE->data[svField261] = 3;
}
- _vm->_globals.DESACTIVE_INVENT = 0;
+ _vm->_globals.DESACTIVE_INVENT = false;
}
if (_vm->_globals.ECRAN == 93 && !_vm->_globals.SAUVEGARDE->data[svField333]) {
- _vm->_globals.DESACTIVE_INVENT = 1;
+ _vm->_globals.DESACTIVE_INVENT = true;
do
_vm->_eventsManager.VBL();
while (BOBPOSI(8) != 3);
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("GM3.PE2");
BOBANIM_OFF(8);
_vm->_globals.SAUVEGARDE->data[svField333] = 1;
- _vm->_globals.DESACTIVE_INVENT = 0;
+ _vm->_globals.DESACTIVE_INVENT = false;
}
}
@@ -4747,15 +4747,15 @@ void ObjectsManager::INILINK(const Common::String &file) {
_vm->_globals.CACHE_BANQUE[1] = _vm->_fileManager.RECHERCHE_CAT(filename2, 8);
if (_vm->_globals.CACHE_BANQUE[1] || _vm->_globals.CACHE_BANQUE[1] == g_PTRNUL) {
- _vm->_globals.CAT_FLAG = 0;
+ _vm->_globals.CAT_FLAG = false;
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, filename2);
} else {
- _vm->_globals.CAT_FLAG = 1;
+ _vm->_globals.CAT_FLAG = true;
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_SLI.RES");
}
_vm->_globals.CACHE_BANQUE[1] = _vm->_fileManager.CHARGE_FICHIER(_vm->_globals.NFICHIER);
- _vm->_globals.CAT_FLAG = 0;
+ _vm->_globals.CAT_FLAG = false;
v36 = 60;
v37 = ptr + 1000;
v40 = 0;
@@ -4954,35 +4954,35 @@ void ObjectsManager::SPECIAL_INI(const Common::String &a1) {
}
if (_vm->_globals.ECRAN == 18 && _vm->_globals.OLD_ECRAN == 17) {
_vm->_eventsManager.souris_n = 4;
- _vm->_globals.BPP_NOAFF = 1;
+ _vm->_globals.BPP_NOAFF = true;
v3 = 0;
do {
_vm->_eventsManager.VBL();
++v3;
} while (v3 <= 4);
- _vm->_globals.BPP_NOAFF = 0;
+ _vm->_globals.BPP_NOAFF = false;
_vm->_graphicsManager.FADE_INW();
_vm->_globals.iRegul = 1;
- _vm->_globals.DESACTIVE_INVENT = 0;
+ _vm->_globals.DESACTIVE_INVENT = false;
_vm->_graphicsManager.NOFADE = 1;
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("MAGE1.pe2");
_vm->_graphicsManager.NOFADE = 1;
- _vm->_globals.DESACTIVE_INVENT = 0;
+ _vm->_globals.DESACTIVE_INVENT = false;
}
if (_vm->_globals.ECRAN == 17 && _vm->_globals.OLD_ECRAN == 20) {
- _vm->_globals.DESACTIVE_INVENT = 1;
+ _vm->_globals.DESACTIVE_INVENT = true;
_vm->_graphicsManager.SETCOLOR3(252, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(253, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(251, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0);
- _vm->_globals.BPP_NOAFF = 1;
+ _vm->_globals.BPP_NOAFF = true;
v4 = 0;
do {
_vm->_eventsManager.VBL();
++v4;
} while (v4 <= 4);
- _vm->_globals.BPP_NOAFF = 0;
+ _vm->_globals.BPP_NOAFF = false;
_vm->_graphicsManager.FADE_INW();
SPRITE_ON(0);
v5 = 0;
@@ -5017,7 +5017,7 @@ void ObjectsManager::SPECIAL_INI(const Common::String &a1) {
++v7;
} while (v7 <= 3);
_vm->_graphicsManager.NOFADE = 1;
- _vm->_globals.DESACTIVE_INVENT = 0;
+ _vm->_globals.DESACTIVE_INVENT = false;
}
}
@@ -5573,11 +5573,11 @@ void ObjectsManager::PERSONAGE(const Common::String &s1, const Common::String &s
_vm->_eventsManager.GAME_KEY = KEY_NONE;
_vm->_dialogsManager.VIRE_INVENT = false;
_vm->_graphicsManager.ofscroll = 0;
- _vm->_globals.PLAN_FLAG = 0;
+ _vm->_globals.PLAN_FLAG = false;
_vm->_globals.iRegul = 1;
_vm->_soundManager.WSOUND(v);
_vm->_globals.chemin = (int16 *)g_PTRNUL;
- _vm->_globals.NOMARCHE = 1;
+ _vm->_globals.NOMARCHE = true;
_vm->_globals.SORTIE = 0;
_vm->_globals.AFFLI = 0;
_vm->_globals.AFFIVBL = 0;
@@ -5606,13 +5606,13 @@ void ObjectsManager::PERSONAGE(const Common::String &s1, const Common::String &s
_vm->_graphicsManager.SETCOLOR3(251, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0);
_vm->_eventsManager.CHANGE_MOUSE(4);
- _vm->_globals.BPP_NOAFF = 1;
+ _vm->_globals.BPP_NOAFF = true;
v6 = 0;
do {
_vm->_eventsManager.VBL();
++v6;
} while (v6 <= 4);
- _vm->_globals.BPP_NOAFF = 0;
+ _vm->_globals.BPP_NOAFF = false;
_vm->_graphicsManager.FADE_INW();
if (_vm->_globals.ECRAN == 61) {
_vm->_animationManager.PLAY_SEQ(0, "OUVRE.SEQ", 10, 4, 10);
@@ -5675,9 +5675,9 @@ void ObjectsManager::PERSONAGE2(const Common::String &s1, const Common::String &
_vm->_globals.MAX_COMPTE = 6;
_vm->_graphicsManager.ofscroll = 0;
_vm->_dialogsManager.VIRE_INVENT = false;
- _vm->_globals.PLAN_FLAG = 0;
+ _vm->_globals.PLAN_FLAG = false;
_vm->_graphicsManager.NOFADE = 0;
- _vm->_globals.NOMARCHE = 0;
+ _vm->_globals.NOMARCHE = false;
_vm->_globals.SORTIE = 0;
_vm->_globals.AFFLI = 0;
_vm->_globals.AFFIVBL = 0;
@@ -5745,13 +5745,13 @@ LABEL_70:
g_old_y = PERY;
_vm->_globals.g_old_sens = -1;
_vm->_globals.Compteur = 0;
- _vm->_globals.BPP_NOAFF = 1;
+ _vm->_globals.BPP_NOAFF = true;
for (int idx = 0; idx < 5; ++idx) {
_vm->_eventsManager.VBL();
}
- _vm->_globals.BPP_NOAFF = 0;
+ _vm->_globals.BPP_NOAFF = false;
_vm->_globals.iRegul = 1;
if (!_vm->_graphicsManager.NOFADE)
_vm->_graphicsManager.FADE_INW();
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index c103261129..822165f4ce 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -647,21 +647,21 @@ LABEL_1141:
_vm->_graphicsManager.FADE_INS();
}
if (v76 == 601) {
- _vm->_globals.NO_VISU = 1;
+ _vm->_globals.NO_VISU = true;
_vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
- _vm->_globals.NO_VISU = 0;
+ _vm->_globals.NO_VISU = false;
_vm->_objectsManager.OPTI_ONE(2, 0, 16, 4);
}
if (v76 == 602) {
- _vm->_globals.NO_VISU = 1;
+ _vm->_globals.NO_VISU = true;
_vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
- _vm->_globals.NO_VISU = 0;
+ _vm->_globals.NO_VISU = false;
_vm->_objectsManager.OPTI_ONE(4, 0, 16, 4);
}
if (v76 == 603) {
- _vm->_globals.NO_VISU = 1;
+ _vm->_globals.NO_VISU = true;
_vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
- _vm->_globals.NO_VISU = 0;
+ _vm->_globals.NO_VISU = false;
_vm->_objectsManager.OPTI_ONE(3, 0, 16, 4);
_vm->_soundManager.SPECIAL_SOUND = 199;
_vm->_graphicsManager.FADE_LINUX = 2;
@@ -675,9 +675,9 @@ LABEL_1141:
_vm->_globals.SORTIE = 151;
}
if (v76 == 604) {
- _vm->_globals.NO_VISU = 1;
+ _vm->_globals.NO_VISU = true;
_vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
- _vm->_globals.NO_VISU = 0;
+ _vm->_globals.NO_VISU = false;
_vm->_objectsManager.OPTI_ONE(1, 0, 16, 4);
_vm->_soundManager.SPECIAL_SOUND = 199;
if (_vm->_globals.SVGA == 1)
@@ -690,9 +690,9 @@ LABEL_1141:
_vm->_globals.SORTIE = 151;
}
if (v76 == 605) {
- _vm->_globals.NO_VISU = 1;
+ _vm->_globals.NO_VISU = true;
_vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
- _vm->_globals.NO_VISU = 0;
+ _vm->_globals.NO_VISU = false;
_vm->_objectsManager.OPTI_ONE(5, 0, 16, 4);
_vm->_graphicsManager.FADE_OUTS();
_vm->_soundManager.SPECIAL_SOUND = 199;
@@ -707,9 +707,9 @@ LABEL_1141:
_vm->_globals.SORTIE = 151;
}
if (v76 == 606) {
- _vm->_globals.NO_VISU = 1;
+ _vm->_globals.NO_VISU = true;
_vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 513, 163, 7);
- _vm->_globals.NO_VISU = 0;
+ _vm->_globals.NO_VISU = false;
_vm->_objectsManager.OPTI_ONE(6, 0, 16, 4);
if (_vm->_globals.SVGA == 1)
_vm->_animationManager.PLAY_ANM("BOMBE3.ANM", 50, 14, 500);
@@ -770,7 +770,7 @@ LABEL_1141:
_vm->_talkManager.PARLER_PERSO("fjour.pe2");
if (v76 == 13) {
_vm->_eventsManager.souris_b = _vm->_eventsManager.souris_bb;
- _vm->_globals.DESACTIVE_INVENT = 1;
+ _vm->_globals.DESACTIVE_INVENT = true;
_vm->_graphicsManager.FADE_OUTW();
_vm->_globals.CACHE_OFF();
_vm->_objectsManager.SPRITE_OFF(0);
@@ -829,7 +829,7 @@ LABEL_1141:
_vm->_graphicsManager.FADE_LINUX = 2;
_vm->_animationManager.PLAY_SEQ2("ASSOM.SEQ", 10, 4, 500);
_vm->_soundManager.SPECIAL_SOUND = 0;
- _vm->_globals.DESACTIVE_INVENT = 0;
+ _vm->_globals.DESACTIVE_INVENT = false;
_vm->_globals.HELICO = 1;
}
if (v76 == 36) {
@@ -868,9 +868,9 @@ LABEL_1141:
_vm->_graphicsManager.NOFADE = 1;
}
if (v76 == 29) {
- _vm->_globals.DESACTIVE_INVENT = 1;
+ _vm->_globals.DESACTIVE_INVENT = true;
_vm->_talkManager.OBJET_VIVANT("TELEP.pe2");
- _vm->_globals.DESACTIVE_INVENT = 0;
+ _vm->_globals.DESACTIVE_INVENT = false;
}
if (v76 == 22)
_vm->_talkManager.OBJET_VIVANT("CADAVRE1.pe2");
@@ -1561,7 +1561,7 @@ LABEL_1141:
_vm->_objectsManager.SPRITE_OFF(0);
_vm->_globals.CACHE_OFF();
_vm->_animationManager.NO_SEQ = 1;
- _vm->_globals.NO_VISU = 0;
+ _vm->_globals.NO_VISU = false;
_vm->_soundManager.SPECIAL_SOUND = 211;
_vm->_animationManager.PLAY_SEQ(v1, "SECRET2.SEQ", 1, 12, 100);
_vm->_soundManager.SPECIAL_SOUND = 0;
@@ -1584,7 +1584,7 @@ LABEL_1141:
if (v76 == 207)
_vm->_talkManager.OBJET_VIVANT("PANNEAU.PE2");
if (v76 == 208) {
- _vm->_globals.DESACTIVE_INVENT = 1;
+ _vm->_globals.DESACTIVE_INVENT = true;
if (_vm->_globals.SAUVEGARDE->data[svField6] != _vm->_globals.SAUVEGARDE->data[svField401]) {
_vm->_soundManager.SPECIAL_SOUND = 208;
_vm->_eventsManager.NOESC = true;
@@ -1608,7 +1608,7 @@ LABEL_1141:
} while (_vm->_globals.chemin != (int16 *)g_PTRNUL);
_vm->_objectsManager.SETANISPR(0, 64);
_vm->_globals.SORTIE = _vm->_globals.SAUVEGARDE->data[svField401];
- _vm->_globals.DESACTIVE_INVENT = 0;
+ _vm->_globals.DESACTIVE_INVENT = false;
}
if (v76 == 209) {
_vm->_objectsManager.SET_BOBPOSI(1, 0);
@@ -1623,7 +1623,7 @@ LABEL_1141:
_vm->_eventsManager.VBL();
} while (_vm->_objectsManager.BOBPOSI(1) != 9);
_vm->_objectsManager.BOBANIM_OFF(1);
- _vm->_globals.NO_VISU = 1;
+ _vm->_globals.NO_VISU = true;
_vm->_globals.chemin = (int16 *)g_PTRNUL;
_vm->_globals.NOT_VERIF = 1;
v39 = _vm->_objectsManager.YSPR(0);
@@ -1662,7 +1662,7 @@ LABEL_1141:
_vm->_objectsManager.BOBANIM_ON(4);
}
if (v76 == 203) {
- _vm->_globals.NO_VISU = 1;
+ _vm->_globals.NO_VISU = true;
_vm->_objectsManager.SPRITE_OFF(0);
_vm->_objectsManager.BOBANIM_ON(4);
do {
@@ -1674,7 +1674,7 @@ LABEL_1141:
_vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 18, 334, 0);
} while (_vm->_objectsManager.BOBPOSI(4) != 26);
_vm->_objectsManager.BOBANIM_OFF(4);
- _vm->_globals.NO_VISU = 0;
+ _vm->_globals.NO_VISU = false;
_vm->_objectsManager.SPRITE_ON(0);
}
if (v76 == 204) {
@@ -1824,9 +1824,9 @@ LABEL_1141:
_vm->_eventsManager.VBL();
} while (_vm->_objectsManager.BOBPOSI(12) != 6);
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("PRMORT.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
do {
if (_vm->shouldQuit())
return -1; // Exiting game
@@ -1859,18 +1859,18 @@ LABEL_1141:
_vm->_eventsManager.VBL();
} while (_vm->_objectsManager.BOBPOSI(13) != 48);
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("HRADIO.PE2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
_vm->_graphicsManager.FADE_OUTW();
_vm->_objectsManager.BOBANIM_OFF(13);
_vm->_graphicsManager.NOFADE = 1;
_vm->_globals.SORTIE = 94;
}
if (v76 == 52) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("GARDE.PE2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 53)
_vm->_talkManager.PARLER_PERSO("GARDE1.pe2");
@@ -2049,9 +2049,9 @@ LABEL_1141:
if (_vm->_globals.SAUVEGARDE->data[svField231] == 1) {
_vm->_talkManager.PARLER_PERSO("chotess1.pe2");
} else {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("chotesse.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
}
if (v76 == 51) {
@@ -2112,40 +2112,40 @@ LABEL_1141:
_vm->_talkManager.PARLER_PERSO("STANDAR1.pe2");
}
if (v76 == 58) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("Gm1.PE2");
_vm->_globals.SAUVEGARDE->data[svField176] = 1;
_vm->_globals.SAUVEGARDE->data[svField270] = 2;
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 200) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("Gm2.PE2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 84) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("CVIGIL1.PE2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 98) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("CVIGIL2.PE2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 83)
_vm->_talkManager.PARLER_PERSO("CVIGIL.pe2");
if (v76 == 32)
_vm->_talkManager.PARLER_PERSO("SAMAN.pe2");
if (v76 == 215) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("aviat.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 216) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("aviat1.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 170)
_vm->_talkManager.PARLER_PERSO("GRED.pe2");
@@ -2154,9 +2154,9 @@ LABEL_1141:
if (v76 == 100)
_vm->_talkManager.PARLER_PERSO("tourist.pe2");
if (v76 == 103) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("tourist1.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
if (_vm->_globals.SVGA == 1)
_vm->_animationManager.PLAY_ANM2("T421.ANM", 100, 14, 500);
if (_vm->_globals.SVGA == 2)
@@ -2164,49 +2164,49 @@ LABEL_1141:
_vm->_eventsManager.VBL();
_vm->_eventsManager.VBL();
_vm->_eventsManager.VBL();
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("tourist2.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 104) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("tourist3.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 108) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("peche1.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 109) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("peche2.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 110) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("peche3.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 111) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("peche4.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 112) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("teint1.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 176) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("gred2.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 177) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("gbleu2.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
if (v76 == 113)
_vm->_talkManager.PARLER_PERSO("teint.pe2");
@@ -2285,9 +2285,9 @@ LABEL_1141:
if (v76 == 241)
_vm->_talkManager.PARLER_PERSO("RECEP.PE2");
if (v76 == 171) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("gred1.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
_vm->_globals.NOT_VERIF = 1;
_vm->_objectsManager.g_old_x = _vm->_objectsManager.XSPR(0);
_vm->_globals.g_old_sens = -1;
@@ -2309,9 +2309,9 @@ LABEL_1141:
_vm->_globals.SORTIE = 59;
}
if (v76 == 173) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("gbleu1.pe2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
_vm->_globals.NOT_VERIF = 1;
_vm->_objectsManager.g_old_x = _vm->_objectsManager.XSPR(0);
_vm->_globals.g_old_sens = -1;
@@ -2335,9 +2335,9 @@ LABEL_1141:
if (v76 == 174)
_vm->_talkManager.PARLER_PERSO("Profbl.pe2");
if (v76 == 202) {
- _vm->_globals.NOPARLE = 1;
+ _vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("SVGARD2.PE2");
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
}
v1 = 1;
}
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index a6c7445f0a..525e2892ce 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -60,7 +60,6 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
byte *v9;
byte *v10;
int v11;
- byte v13;
int v14;
int v15;
Common::String v16;
@@ -70,8 +69,8 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
_vm->_fontManager.TEXTE_OFF(9);
_vm->_eventsManager.VBL();
_vm->_graphicsManager.no_scroll = 1;
- v13 = _vm->_globals.DESACTIVE_INVENT;
- _vm->_globals.DESACTIVE_INVENT = 1;
+ bool old_DESACTIVE_INVENT = _vm->_globals.DESACTIVE_INVENT;
+ _vm->_globals.DESACTIVE_INVENT = true;
BUFFERPERSO = _vm->_fileManager.RECHERCHE_CAT(filename, 5);
TAILLEPERSO = _vm->_globals.CAT_TAILLE;
if (BUFFERPERSO == g_PTRNUL) {
@@ -95,14 +94,14 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
PCHERCHE = 20 * (int16)READ_LE_UINT16((uint16 *)BUFFERPERSO + 42) + 110;
PERSOSPR = _vm->_fileManager.RECHERCHE_CAT(v16, 7);
if (PERSOSPR) {
- _vm->_globals.CAT_FLAG = 0;
+ _vm->_globals.CAT_FLAG = false;
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, v16);
} else {
- _vm->_globals.CAT_FLAG = 1;
+ _vm->_globals.CAT_FLAG = true;
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_SAN.RES");
}
PERSOSPR = _vm->_objectsManager.CHARGE_SPRITE(_vm->_globals.NFICHIER);
- _vm->_globals.CAT_FLAG = 0;
+ _vm->_globals.CAT_FLAG = false;
_vm->_fileManager.CONSTRUIT_LINUX("TEMP.SCR");
if (_vm->_graphicsManager.nbrligne == SCREEN_WIDTH)
@@ -135,14 +134,14 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
_vm->_eventsManager.VBL();
} while (v5 != v4);
}
- if (_vm->_globals.NOPARLE == 1) {
+ if (_vm->_globals.NOPARLE == true) {
v6 = 1;
do
v7 = DIALOGUE_REP(v6++);
while (v7 != -1);
}
CLEAR_ANIM_PERSO();
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
_vm->_globals.NECESSAIRE = 1;
BUFFERPERSO = _vm->_globals.LIBERE_FICHIER(BUFFERPERSO);
PERSOSPR = _vm->_globals.LIBERE_FICHIER(PERSOSPR);
@@ -182,7 +181,7 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
v8 = v8 + 2;
*v8 = *(v9 + 2);
v10 = v8 + 1;
- _vm->_globals.DESACTIVE_INVENT = v13;
+ _vm->_globals.DESACTIVE_INVENT = old_DESACTIVE_INVENT;
_vm->_graphicsManager.DD_VBL();
v11 = 0;
do {
@@ -1228,14 +1227,14 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
}
PERSOSPR = _vm->_fileManager.RECHERCHE_CAT(v23, 7);
if (PERSOSPR) {
- _vm->_globals.CAT_FLAG = 0;
+ _vm->_globals.CAT_FLAG = false;
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, v23);
} else {
- _vm->_globals.CAT_FLAG = 1;
+ _vm->_globals.CAT_FLAG = true;
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_SAN.RES");
}
PERSOSPR = _vm->_objectsManager.CHARGE_SPRITE(_vm->_globals.NFICHIER);
- _vm->_globals.CAT_FLAG = 0;
+ _vm->_globals.CAT_FLAG = false;
_vm->_fileManager.CONSTRUIT_LINUX("TEMP.SCR");
if (_vm->_graphicsManager.nbrligne == SCREEN_WIDTH)
@@ -1254,7 +1253,7 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
CHERCHE_ANIM0(v10, 0);
v11 = _vm->_globals.COUCOU;
_vm->_globals.COUCOU = g_PTRNUL;
- _vm->_globals.NOMARCHE = 1;
+ _vm->_globals.NOMARCHE = true;
_vm->_objectsManager.INILINK(v22);
_vm->_objectsManager.PERSO_ON = 1;
_vm->_globals.GOACTION = 0;
@@ -1263,7 +1262,7 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
VISU_PARLE();
VISU_WAIT();
_vm->_graphicsManager.INI_ECRAN2(v22);
- _vm->_globals.NOMARCHE = 1;
+ _vm->_globals.NOMARCHE = true;
_vm->_objectsManager.FORCEZONE = 1;
_vm->_objectsManager.NUMZONE = -1;
do {
@@ -1283,7 +1282,7 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
FIN_VISU_WAIT();
CLEAR_ANIM_PERSO();
CLEAR_ANIM_PERSO();
- _vm->_globals.NOPARLE = 0;
+ _vm->_globals.NOPARLE = false;
_vm->_globals.NECESSAIRE = 1;
BUFFERPERSO = _vm->_globals.LIBERE_FICHIER(BUFFERPERSO);
PERSOSPR = _vm->_globals.LIBERE_FICHIER(PERSOSPR);
@@ -1302,7 +1301,7 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
_vm->_objectsManager.INILINK(v20);
_vm->_graphicsManager.INI_ECRAN2(v20);
_vm->_objectsManager.DESACTIVE = 0;
- _vm->_globals.NOMARCHE = 0;
+ _vm->_globals.NOMARCHE = false;
if (_vm->_globals.SORTIE == 101)
_vm->_globals.SORTIE = 0;
@@ -1339,7 +1338,7 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
v14 = v14 + 2;
*v14 = *(v15 + 2);
v16 = v14 + 1;
- _vm->_globals.DESACTIVE_INVENT = 0;
+ _vm->_globals.DESACTIVE_INVENT = false;
_vm->_graphicsManager.DD_VBL();
v17 = 0;
do {
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-17 19:07:52 +0000