aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2012-10-29 22:54:35 +0100
committerStrangerke2012-10-29 22:54:35 +0100
commita79cf7fa4fdc1c2cf087e1ab3054a36d04d3787e (patch)
tree4029c63cdc428a46f910ca976fe1aa1ef9c5f38f /engines
parentc078f3d3a74f2ce26e129a225a07713614a70bf0 (diff)
downloadscummvm-rg350-a79cf7fa4fdc1c2cf087e1ab3054a36d04d3787e.tar.gz
scummvm-rg350-a79cf7fa4fdc1c2cf087e1ab3054a36d04d3787e.tar.bz2
scummvm-rg350-a79cf7fa4fdc1c2cf087e1ab3054a36d04d3787e.zip
HOPKINS: Replace some more boolean values
Diffstat (limited to 'engines')
-rw-r--r--engines/hopkins/anim.cpp74
-rw-r--r--engines/hopkins/dialogs.cpp6
-rw-r--r--engines/hopkins/events.cpp2
-rw-r--r--engines/hopkins/globals.cpp1
-rw-r--r--engines/hopkins/globals.h1
-rw-r--r--engines/hopkins/hopkins.cpp8
-rw-r--r--engines/hopkins/objects.cpp36
-rw-r--r--engines/hopkins/script.cpp38
8 files changed, 82 insertions, 84 deletions
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index 661c1762c1..5102a883a6 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -70,7 +70,7 @@ LABEL_2:
f.skip(14);
f.read(v10, nbytes);
- if (CLS_ANM == 1) {
+ if (CLS_ANM == true) {
_vm->_graphicsManager.DD_Lock();
_vm->_graphicsManager.Cls_Video();
_vm->_graphicsManager.DD_Unlock();
@@ -117,7 +117,7 @@ LABEL_2:
goto LABEL_25;
}
LABEL_53:
- if (_vm->_graphicsManager.NOLOCK == 1)
+ if (_vm->_graphicsManager.NOLOCK == true)
goto LABEL_58;
_vm->_globals.dos_free2(ptr);
f.close();
@@ -184,9 +184,9 @@ LABEL_57:
goto LABEL_58;
}
}
- while (!_vm->shouldQuit() && _vm->_eventsManager.ESC_KEY != 1) {
- if (REDRAW_ANIM() == 1) {
- if (_vm->_graphicsManager.NOLOCK == 1)
+ while (!_vm->shouldQuit() && _vm->_eventsManager.ESC_KEY != true) {
+ if (REDRAW_ANIM() == true) {
+ if (_vm->_graphicsManager.NOLOCK == true)
break;
_vm->_globals.dos_free2(ptr);
f.close();
@@ -240,7 +240,7 @@ LABEL_58:
_vm->_graphicsManager.FADE_LINUX = 0;
f.close();
_vm->_globals.dos_free2(ptr);
- _vm->_graphicsManager.NOLOCK = 0;
+ _vm->_graphicsManager.NOLOCK = false;
}
// Play Anim 2
@@ -342,20 +342,20 @@ void AnimationManager::PLAY_ANM2(const Common::String &filename, uint32 a2, uint
_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 (1) {
- if (_vm->_eventsManager.ESC_KEY == 1)
+ if (_vm->_eventsManager.ESC_KEY == true)
goto LABEL_114;
- if (REDRAW_ANIM() == 1)
+ if (REDRAW_ANIM() == true)
break;
_vm->_eventsManager.CONTROLE_MES();
if (_vm->_eventsManager.lItCounter >= a2)
goto LABEL_48;
}
- if (_vm->_graphicsManager.NOLOCK == 1)
+ if (_vm->_graphicsManager.NOLOCK == true)
goto LABEL_114;
if (v8 == 1)
ptr = _vm->_globals.dos_free2(ptr);
@@ -373,7 +373,7 @@ void AnimationManager::PLAY_ANM2(const Common::String &filename, uint32 a2, uint
_vm->_graphicsManager.DD_Unlock();
_vm->_graphicsManager.SCROLL = v11;
_vm->_graphicsManager.SCROLL_ECRAN(v11);
- if (_vm->_graphicsManager.DOUBLE_ECRAN == 1) {
+ if (_vm->_graphicsManager.DOUBLE_ECRAN == true) {
_vm->_graphicsManager.SCANLINE(0x500u);
_vm->_graphicsManager.max_x = 1280;
_vm->_graphicsManager.DD_Lock();
@@ -459,9 +459,9 @@ LABEL_77:
LABEL_88:
if (v5 == -1) {
if (_vm->_globals.iRegul == 1) {
- while (_vm->_eventsManager.ESC_KEY != 1) {
- if (REDRAW_ANIM() == 1) {
- if (_vm->_graphicsManager.NOLOCK == 1)
+ while (_vm->_eventsManager.ESC_KEY != true) {
+ if (REDRAW_ANIM() == true) {
+ if (_vm->_graphicsManager.NOLOCK == true)
goto LABEL_114;
if (v8 == 1)
ptr = _vm->_globals.dos_free2(ptr);
@@ -479,7 +479,7 @@ LABEL_88:
_vm->_graphicsManager.DD_Unlock();
_vm->_graphicsManager.SCROLL = v11;
_vm->_graphicsManager.SCROLL_ECRAN(v11);
- if (_vm->_graphicsManager.DOUBLE_ECRAN == 1) {
+ if (_vm->_graphicsManager.DOUBLE_ECRAN == true) {
_vm->_graphicsManager.SCANLINE(0x500u);
_vm->_graphicsManager.max_x = 1280;
_vm->_graphicsManager.DD_Lock();
@@ -524,9 +524,9 @@ LABEL_88:
goto LABEL_114;
}
}
- while (_vm->_eventsManager.ESC_KEY != 1) {
- if (REDRAW_ANIM() == 1) {
- if (_vm->_graphicsManager.NOLOCK == 1)
+ while (_vm->_eventsManager.ESC_KEY != true) {
+ if (REDRAW_ANIM() == true) {
+ if (_vm->_graphicsManager.NOLOCK == true)
break;
if (v8 == 1)
ptr = _vm->_globals.dos_free2(ptr);
@@ -544,7 +544,7 @@ LABEL_88:
_vm->_graphicsManager.DD_Unlock();
_vm->_graphicsManager.SCROLL = v11;
_vm->_graphicsManager.SCROLL_ECRAN(v11);
- if (_vm->_graphicsManager.DOUBLE_ECRAN == 1) {
+ if (_vm->_graphicsManager.DOUBLE_ECRAN == true) {
_vm->_graphicsManager.SCANLINE(0x500u);
_vm->_graphicsManager.max_x = 1280;
_vm->_graphicsManager.DD_Lock();
@@ -586,7 +586,7 @@ LABEL_88:
goto LABEL_77;
}
LABEL_114:
- _vm->_graphicsManager.NOLOCK = 0;
+ _vm->_graphicsManager.NOLOCK = false;
f.close();
if (_vm->_graphicsManager.FADE_LINUX == 2 && !v8) {
@@ -642,7 +642,7 @@ LABEL_114:
_vm->_graphicsManager.DD_Unlock();
_vm->_graphicsManager.SCROLL = v11;
_vm->_graphicsManager.SCROLL_ECRAN(v11);
- if (_vm->_graphicsManager.DOUBLE_ECRAN == 1) {
+ if (_vm->_graphicsManager.DOUBLE_ECRAN == true) {
_vm->_graphicsManager.SCANLINE(0x500u);
_vm->_graphicsManager.max_x = 1280;
_vm->_graphicsManager.DD_Lock();
@@ -1040,14 +1040,14 @@ void AnimationManager::PLAY_SEQ(int a1, const Common::String &a2, uint32 a3, uin
_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) {
do {
- if (_vm->_eventsManager.ESC_KEY == 1) {
+ if (_vm->_eventsManager.ESC_KEY == true) {
if (!_vm->_eventsManager.NOESC)
goto LABEL_59;
- _vm->_eventsManager.ESC_KEY = 0;
+ _vm->_eventsManager.ESC_KEY = false;
}
_vm->_eventsManager.CONTROLE_MES();
_vm->_soundManager.VERIF_SOUND();
@@ -1070,10 +1070,10 @@ void AnimationManager::PLAY_SEQ(int a1, const Common::String &a2, uint32 a3, uin
f.read(v9, (int16)READ_LE_UINT16(v10 + 8));
if (_vm->_globals.iRegul == 1) {
do {
- if (_vm->_eventsManager.ESC_KEY == 1) {
+ if (_vm->_eventsManager.ESC_KEY == true) {
if (!_vm->_eventsManager.NOESC)
goto LABEL_59;
- _vm->_eventsManager.ESC_KEY = 0;
+ _vm->_eventsManager.ESC_KEY = false;
}
_vm->_eventsManager.CONTROLE_MES();
_vm->_soundManager.VERIF_SOUND();
@@ -1102,10 +1102,10 @@ void AnimationManager::PLAY_SEQ(int a1, const Common::String &a2, uint32 a3, uin
} while (v5 != -1);
if (_vm->_globals.iRegul == 1) {
do {
- if (_vm->_eventsManager.ESC_KEY == 1) {
+ if (_vm->_eventsManager.ESC_KEY == true) {
if (!_vm->_eventsManager.NOESC)
goto LABEL_59;
- _vm->_eventsManager.ESC_KEY = 0;
+ _vm->_eventsManager.ESC_KEY = false;
}
_vm->_eventsManager.CONTROLE_MES();
_vm->_soundManager.VERIF_SOUND();
@@ -1113,7 +1113,7 @@ void AnimationManager::PLAY_SEQ(int a1, const Common::String &a2, uint32 a3, uin
}
_vm->_eventsManager.lItCounter = 0;
LABEL_59:
- _vm->_graphicsManager.NOLOCK = 0;
+ _vm->_graphicsManager.NOLOCK = false;
f.close();
if (!NO_COUL) {
@@ -1205,14 +1205,14 @@ void AnimationManager::PLAY_SEQ2(const Common::String &a1, uint32 a2, uint32 a3,
_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_54;
- if (REDRAW_ANIM() == 1)
+ if (REDRAW_ANIM() == true)
break;
_vm->_eventsManager.CONTROLE_MES();
_vm->_soundManager.VERIF_SOUND();
@@ -1220,7 +1220,7 @@ void AnimationManager::PLAY_SEQ2(const Common::String &a1, uint32 a2, uint32 a3,
goto LABEL_23;
}
LABEL_48:
- if (_vm->_graphicsManager.NOLOCK == 1)
+ if (_vm->_graphicsManager.NOLOCK == true)
goto LABEL_54;
if (v7 == 1)
ptr = _vm->_globals.dos_free2(ptr);
@@ -1268,8 +1268,8 @@ LABEL_33:
LABEL_44:
if (v4) {
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_48;
_vm->_eventsManager.CONTROLE_MES();
_vm->_soundManager.VERIF_SOUND();
@@ -1283,9 +1283,9 @@ LABEL_53:
goto LABEL_54;
}
}
- while (_vm->_eventsManager.ESC_KEY != 1) {
+ while (_vm->_eventsManager.ESC_KEY != true) {
_vm->_eventsManager.CONTROLE_MES();
- if (REDRAW_ANIM() == 1)
+ if (REDRAW_ANIM() == true)
goto LABEL_48;
if (_vm->_eventsManager.lItCounter >= a3)
goto LABEL_33;
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
index 28baa319e7..d7b2c9d4d6 100644
--- a/engines/hopkins/dialogs.cpp
+++ b/engines/hopkins/dialogs.cpp
@@ -437,7 +437,7 @@ LABEL_7:
}
}
}
- if (VIRE_INVENT == 1)
+ if (VIRE_INVENT == true)
v20 = 1;
if (v20 == 1)
break;
@@ -529,7 +529,7 @@ void DialogsManager::TestForDialogOpening() {
if (!INVENTFLAG) {
DIALOG_KEY key = _vm->_eventsManager.GAME_KEY;
_vm->_eventsManager.GAME_KEY = KEY_NONE;
- INVENTFLAG = 1;
+ INVENTFLAG = true;
switch (key) {
case KEY_INVENTORY:
@@ -548,7 +548,7 @@ void DialogsManager::TestForDialogOpening() {
break;
}
- INVENTFLAG = 0;
+ INVENTFLAG = false;
_vm->_eventsManager.GAME_KEY = KEY_NONE;
}
}
diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
index dc667d5d28..0b3d252f57 100644
--- a/engines/hopkins/events.cpp
+++ b/engines/hopkins/events.cpp
@@ -408,7 +408,7 @@ LABEL_63:
LABEL_65:
_vm->_globals.vitesse = 2;
lItCounter = 0;
- if (_vm->_graphicsManager.DOUBLE_ECRAN != 1 || _vm->_graphicsManager.no_scroll == 1) {
+ if (_vm->_graphicsManager.DOUBLE_ECRAN != true || _vm->_graphicsManager.no_scroll == 1) {
_vm->_graphicsManager.Affiche_Segment_Vesa();
} else {
if (_vm->_graphicsManager.no_scroll != 2) {
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index 6809faa0d6..0dd8caec9f 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -221,7 +221,6 @@ Globals::Globals() {
VOICEOFF = false;
CENSURE = false;
GESTE_FLAG = false;
- redraw = false;
BPP_NOAFF = false;
DESACTIVE_INVENT = false;
FLAG_VISIBLE = false;
diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index 5bfbd49958..e03bd6e362 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -386,7 +386,6 @@ public:
byte *Bufferdecor;
byte *ADR_FICHIER_OBJ;
byte *PERSO;
- bool redraw;
int OBJL, OBJH;
int Nouv_objet;
int HELICO;
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index e3fe6e99c5..b935cb4d09 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -646,7 +646,7 @@ void HopkinsEngine::INTRORUN() {
_globals.iRegul = 1;
_eventsManager.VBL();
_soundManager.WSOUND(16);
- _animationManager.CLS_ANM = 1;
+ _animationManager.CLS_ANM = true;
_animationManager.PLAY_ANM("J1.anm", 12, 12, 50);
if (!_eventsManager.ESC_KEY) {
_soundManager.VOICE_MIX(1, 3);
@@ -681,7 +681,7 @@ void HopkinsEngine::INTRORUN() {
_globals.BPP_NOAFF = false;
_globals.iRegul = 1;
_graphicsManager.FADE_INW();
- if (_graphicsManager.DOUBLE_ECRAN == 1) {
+ if (_graphicsManager.DOUBLE_ECRAN == true) {
_graphicsManager.no_scroll = 2;
v3 = 0;
_graphicsManager.SCROLL = 0;
@@ -858,7 +858,7 @@ void HopkinsEngine::INTRORUN() {
_graphicsManager.FADE_OUTW();
_graphicsManager.FIN_VISU();
- _animationManager.CLS_ANM = 1;
+ _animationManager.CLS_ANM = true;
_soundManager.WSOUND(3);
_soundManager.SPECIAL_SOUND = 1;
_animationManager.PLAY_ANM("INTRO1.anm", 10, 24, 18);
@@ -878,7 +878,7 @@ void HopkinsEngine::INTRORUN() {
return;
if (!_eventsManager.ESC_KEY) {
- _animationManager.CLS_ANM = 0;
+ _animationManager.CLS_ANM = false;
_graphicsManager.FADE_LINUX = 2;
_animationManager.PLAY_ANM("J4.anm", 12, 12, 1000);
}
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index 1896aa7f3f..ef32ac4fd5 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -2762,12 +2762,12 @@ void ObjectsManager::BTGAUCHE() {
if (!_vm->_dialogsManager.INVENTFLAG && !_vm->_globals.PLAN_FLAG && destX > _vm->_graphicsManager.ofscroll - 30 && destX < _vm->_graphicsManager.ofscroll + 50 && (uint16)(destY + 29) <= 0x4Eu) {
v1 = _vm->_eventsManager.btsouris;
- _vm->_dialogsManager.INVENTFLAG = 1;
+ _vm->_dialogsManager.INVENTFLAG = true;
_vm->_dialogsManager.showInventory();
- _vm->_dialogsManager.INVENTFLAG = 0;
+ _vm->_dialogsManager.INVENTFLAG = false;
_vm->_eventsManager.GAME_KEY = KEY_NONE;
if (!_vm->_globals.SORTIE) {
- _vm->_dialogsManager.INVENTFLAG = 0;
+ _vm->_dialogsManager.INVENTFLAG = false;
_vm->_eventsManager.btsouris = v1;
}
return;
@@ -2939,7 +2939,7 @@ void ObjectsManager::PARADISE() {
if (result && _vm->_globals.SAUVEGARDE->data[svField2] && result != 4 && result > 3) {
_vm->_fontManager.TEXTE_OFF(5);
if (_vm->_globals.FORET != 1 || ((uint16)(NUMZONE - 20) > 1u && (uint16)(NUMZONE - 22) > 1u)) {
- if (_vm->_graphicsManager.DOUBLE_ECRAN == 1) {
+ if (_vm->_graphicsManager.DOUBLE_ECRAN == true) {
_vm->_graphicsManager.no_scroll = 2;
if (_vm->_eventsManager.start_x >= XSPR(0) - 320)
goto LABEL_64;
@@ -3735,7 +3735,7 @@ void ObjectsManager::VERBEPLUS() {
do {
_vm->_eventsManager.btsouris = 4;
LABEL_24:
- if (_vm->_globals.NOMARCHE != 1 || (v = NUMZONE + 1, (uint16)(NUMZONE + 1) <= 1u)) {
+ if (_vm->_globals.NOMARCHE != true || (v = NUMZONE + 1, (uint16)(NUMZONE + 1) <= 1u)) {
if (_vm->_eventsManager.btsouris == 4)
return;
} else {
@@ -4275,10 +4275,10 @@ void ObjectsManager::SPECIAL_JEU() {
_vm->_graphicsManager.NB_SCREEN();
_vm->_soundManager.SPECIAL_SOUND = 198;
PERSO_ON = 1;
- _vm->_animationManager.NO_SEQ = 1;
- _vm->_animationManager.CLS_ANM = 0;
+ _vm->_animationManager.NO_SEQ = true;
+ _vm->_animationManager.CLS_ANM = false;
_vm->_animationManager.PLAY_ANM("otage.ANM", 1, 24, 500);
- _vm->_animationManager.NO_SEQ = 0;
+ _vm->_animationManager.NO_SEQ = false;
_vm->_soundManager.SPECIAL_SOUND = 0;
_vm->_globals.NECESSAIRE = 1;
_vm->_graphicsManager.NB_SCREEN();
@@ -4964,10 +4964,10 @@ void ObjectsManager::SPECIAL_INI(const Common::String &a1) {
_vm->_graphicsManager.FADE_INW();
_vm->_globals.iRegul = 1;
_vm->_globals.DESACTIVE_INVENT = false;
- _vm->_graphicsManager.NOFADE = 1;
+ _vm->_graphicsManager.NOFADE = true;
_vm->_globals.NOPARLE = true;
_vm->_talkManager.PARLER_PERSO("MAGE1.pe2");
- _vm->_graphicsManager.NOFADE = 1;
+ _vm->_graphicsManager.NOFADE = true;
_vm->_globals.DESACTIVE_INVENT = false;
}
if (_vm->_globals.ECRAN == 17 && _vm->_globals.OLD_ECRAN == 20) {
@@ -5016,7 +5016,7 @@ void ObjectsManager::SPECIAL_INI(const Common::String &a1) {
_vm->_eventsManager.VBL();
++v7;
} while (v7 <= 3);
- _vm->_graphicsManager.NOFADE = 1;
+ _vm->_graphicsManager.NOFADE = true;
_vm->_globals.DESACTIVE_INVENT = false;
}
}
@@ -5531,7 +5531,7 @@ void ObjectsManager::TEST_FORET(int a1, int a2, int a3, int a4, int a5, int a6)
_vm->_graphicsManager.FADE_LINUX = 2;
_vm->_animationManager.PLAY_ANM("CREVE2.ANM", 100, 24, 500);
_vm->_globals.SORTIE = 150;
- _vm->_graphicsManager.NOFADE = 1;
+ _vm->_graphicsManager.NOFADE = true;
BOB_OFF(1);
BOB_OFF(2);
BOB_OFF(3);
@@ -5569,7 +5569,7 @@ void ObjectsManager::PERSONAGE(const Common::String &s1, const Common::String &s
int v9;
v5 = 0;
- _vm->_dialogsManager.INVENTFLAG = 0;
+ _vm->_dialogsManager.INVENTFLAG = false;
_vm->_eventsManager.GAME_KEY = KEY_NONE;
_vm->_dialogsManager.VIRE_INVENT = false;
_vm->_graphicsManager.ofscroll = 0;
@@ -5669,14 +5669,14 @@ void ObjectsManager::PERSONAGE2(const Common::String &s1, const Common::String &
bool breakFlag;
int xp, yp;
- _vm->_dialogsManager.INVENTFLAG = 0;
+ _vm->_dialogsManager.INVENTFLAG = false;
_vm->_eventsManager.GAME_KEY = KEY_NONE;
verbe = 4;
_vm->_globals.MAX_COMPTE = 6;
_vm->_graphicsManager.ofscroll = 0;
_vm->_dialogsManager.VIRE_INVENT = false;
_vm->_globals.PLAN_FLAG = false;
- _vm->_graphicsManager.NOFADE = 0;
+ _vm->_graphicsManager.NOFADE = false;
_vm->_globals.NOMARCHE = false;
_vm->_globals.SORTIE = 0;
_vm->_globals.AFFLI = 0;
@@ -5732,7 +5732,7 @@ LABEL_70:
if (_vm->_globals.PERSO_TYPE == 2)
SPRITE(_vm->_globals.PERSO, PERX, PERY, 0, PERI, 0, 0, 20, 127);
_vm->_eventsManager.souris_xy(PERX, PERY);
- if (_vm->_graphicsManager.DOUBLE_ECRAN == 1)
+ if (_vm->_graphicsManager.DOUBLE_ECRAN == true)
_vm->_graphicsManager.SCROLL = (int16)XSPR(0) - 320;
VERIFTAILLE();
SPRITE_ON(0);
@@ -5755,7 +5755,7 @@ LABEL_70:
_vm->_globals.iRegul = 1;
if (!_vm->_graphicsManager.NOFADE)
_vm->_graphicsManager.FADE_INW();
- _vm->_graphicsManager.NOFADE = 0;
+ _vm->_graphicsManager.NOFADE = false;
_vm->_eventsManager.CHANGE_MOUSE(4);
int xCheck = 0;
@@ -5805,7 +5805,7 @@ LABEL_70:
if (_vm->_globals.SORTIE != 8 || _vm->_globals.ECRAN != 5 || _vm->_globals.HELICO != 1) {
if (!_vm->_graphicsManager.NOFADE)
_vm->_graphicsManager.FADE_OUTW();
- _vm->_graphicsManager.NOFADE = 0;
+ _vm->_graphicsManager.NOFADE = false;
SPRITE_OFF(0);
_vm->_globals.AFFLI = 0;
if (DEUXPERSO == 1) {
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index 822165f4ce..43b0eafc86 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -671,7 +671,7 @@ LABEL_1141:
_vm->_animationManager.PLAY_ANM("BOMBE2A.ANM", 50, 14, 500);
_vm->_soundManager.SPECIAL_SOUND = 0;
memset(_vm->_graphicsManager.VESA_BUFFER, 0, 0x96000u);
- _vm->_graphicsManager.NOFADE = 1;
+ _vm->_graphicsManager.NOFADE = true;
_vm->_globals.SORTIE = 151;
}
if (v76 == 604) {
@@ -685,7 +685,7 @@ LABEL_1141:
if (_vm->_globals.SVGA == 2)
_vm->_animationManager.PLAY_ANM("BOMBE2A.ANM", 50, 14, 500);
_vm->_soundManager.SPECIAL_SOUND = 0;
- _vm->_graphicsManager.NOFADE = 1;
+ _vm->_graphicsManager.NOFADE = true;
memset(_vm->_graphicsManager.VESA_BUFFER, 0, 0x96000u);
_vm->_globals.SORTIE = 151;
}
@@ -702,7 +702,7 @@ LABEL_1141:
if (_vm->_globals.SVGA == 2)
_vm->_animationManager.PLAY_ANM("BOMBE2A.ANM", 50, 14, 500);
_vm->_soundManager.SPECIAL_SOUND = 0;
- _vm->_graphicsManager.NOFADE = 1;
+ _vm->_graphicsManager.NOFADE = true;
memset(_vm->_graphicsManager.VESA_BUFFER, 0, 0x96000u);
_vm->_globals.SORTIE = 151;
}
@@ -851,7 +851,7 @@ LABEL_1141:
if (v76 == 37) {
_vm->_graphicsManager.FADE_LINUX = 2;
_vm->_animationManager.PLAY_SEQ2("corde.SEQ", 32, 32, 100);
- _vm->_graphicsManager.NOFADE = 1;
+ _vm->_graphicsManager.NOFADE = true;
}
if (v76 == 38) {
_vm->_soundManager.CHARGE_SAMPLE(1, "SOUND44.WAV");
@@ -865,7 +865,7 @@ LABEL_1141:
_vm->_soundManager.DEL_SAMPLE(1);
_vm->_soundManager.DEL_SAMPLE(2);
_vm->_soundManager.DEL_SAMPLE(3);
- _vm->_graphicsManager.NOFADE = 1;
+ _vm->_graphicsManager.NOFADE = true;
}
if (v76 == 29) {
_vm->_globals.DESACTIVE_INVENT = true;
@@ -1539,7 +1539,7 @@ LABEL_1141:
_vm->_objectsManager.SPRITE_ON(0);
}
if (v76 == 210) {
- _vm->_animationManager.NO_SEQ = 1;
+ _vm->_animationManager.NO_SEQ = true;
_vm->_soundManager.SPECIAL_SOUND = 210;
_vm->_animationManager.PLAY_SEQ2("SECRET1.SEQ", 1, 12, 1);
_vm->_soundManager.SPECIAL_SOUND = 0;
@@ -1549,7 +1549,7 @@ LABEL_1141:
_vm->_objectsManager.INILINK("IM73a");
_vm->_objectsManager.OBSSEUL = 0;
_vm->_globals.CACHE_ON();
- _vm->_animationManager.NO_SEQ = 0;
+ _vm->_animationManager.NO_SEQ = false;
_vm->_globals.CACHE_ADD(0);
_vm->_globals.CACHE_ADD(1);
_vm->_graphicsManager.SETCOLOR4(252, 100, 100, 100);
@@ -1560,13 +1560,13 @@ LABEL_1141:
if (v76 == 211) {
_vm->_objectsManager.SPRITE_OFF(0);
_vm->_globals.CACHE_OFF();
- _vm->_animationManager.NO_SEQ = 1;
+ _vm->_animationManager.NO_SEQ = true;
_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;
- _vm->_animationManager.NO_SEQ = 0;
- _vm->_graphicsManager.NOFADE = 1;
+ _vm->_animationManager.NO_SEQ = false;
+ _vm->_graphicsManager.NOFADE = true;
_vm->_graphicsManager.FADE_OUTW();
v36 = 1;
do {
@@ -1864,7 +1864,7 @@ LABEL_1141:
_vm->_globals.NOPARLE = false;
_vm->_graphicsManager.FADE_OUTW();
_vm->_objectsManager.BOBANIM_OFF(13);
- _vm->_graphicsManager.NOFADE = 1;
+ _vm->_graphicsManager.NOFADE = true;
_vm->_globals.SORTIE = 94;
}
if (v76 == 52) {
@@ -2080,7 +2080,7 @@ LABEL_1141:
} while (_vm->_objectsManager.BOBPOSI(12) != 34);
_vm->_objectsManager.BOBANIM_OFF(2);
_vm->_graphicsManager.FADE_OUTW();
- _vm->_graphicsManager.NOFADE = 1;
+ _vm->_graphicsManager.NOFADE = true;
_vm->_globals.SORTIE = 20;
}
if (v76 == 41)
@@ -2221,18 +2221,18 @@ LABEL_1141:
if (v76 == 243) {
_vm->_soundManager.PLAY_SOUND("SOUND88.WAV");
if (_vm->_globals.SAUVEGARDE->data[svField341] == 2) {
- _vm->_animationManager.NO_SEQ = 1;
+ _vm->_animationManager.NO_SEQ = true;
_vm->_animationManager.PLAY_SEQ(v1, "RESU.SEQ", 2, 24, 2);
- _vm->_animationManager.NO_SEQ = 0;
+ _vm->_animationManager.NO_SEQ = false;
} else {
_vm->_objectsManager.OPTI_ONE(7, 0, 14, 0);
}
}
if (v76 == 242) {
_vm->_soundManager.PLAY_SOUND("SOUND87.WAV");
- _vm->_animationManager.NO_SEQ = 1;
+ _vm->_animationManager.NO_SEQ = true;
_vm->_animationManager.PLAY_SEQ(v1, "RESUF.SEQ", 1, 24, 1);
- _vm->_animationManager.NO_SEQ = 0;
+ _vm->_animationManager.NO_SEQ = false;
v53 = &_vm->_globals.SAUVEGARDE->field380;
v53->field0 = 404;
v53->field1 = 395;
@@ -2266,10 +2266,10 @@ LABEL_1141:
_vm->_objectsManager.OPTI_ONE(6, 0, 15, 0);
_vm->_objectsManager.PERSO_ON = 1;
_vm->_graphicsManager.NB_SCREEN();
- _vm->_animationManager.NO_SEQ = 1;
+ _vm->_animationManager.NO_SEQ = true;
_vm->_animationManager.PLAY_SEQ2("TUNNEL.SEQ", 1, 18, 20);
- _vm->_animationManager.NO_SEQ = 0;
- _vm->_graphicsManager.NOFADE = 1;
+ _vm->_animationManager.NO_SEQ = false;
+ _vm->_graphicsManager.NOFADE = true;
_vm->_graphicsManager.FADE_OUTW();
_vm->_objectsManager.PERSO_ON = 0;
_vm->_globals.SORTIE = 100;