aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/hopkins/dialogs.cpp20
-rw-r--r--engines/hopkins/hopkins.cpp8
-rw-r--r--engines/hopkins/menu.cpp6
-rw-r--r--engines/hopkins/objects.cpp34
-rw-r--r--engines/hopkins/objects.h4
-rw-r--r--engines/hopkins/script.cpp20
-rw-r--r--engines/hopkins/talk.cpp14
7 files changed, 53 insertions, 53 deletions
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
index d7b2c9d4d6..28207bf6c7 100644
--- a/engines/hopkins/dialogs.cpp
+++ b/engines/hopkins/dialogs.cpp
@@ -4,9 +4,9 @@
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
- * This program is _globals.FRee software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the _globals.FRee Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
@@ -15,7 +15,7 @@
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the _globals.FRee Software
+ * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
@@ -304,7 +304,7 @@ void DialogsManager::showInventory() {
if (!VIRE_INVENT && !AFFINVEN && !_vm->_globals.DESACTIVE_INVENT) {
_vm->_graphicsManager.no_scroll = 1;
_vm->_objectsManager.FLAG_VISIBLE_EFFACE = 4;
- _vm->_objectsManager.FLAG_VISIBLE = 0;
+ _vm->_objectsManager.FLAG_VISIBLE = false;
v1 = 0;
do {
INVENT_ANIM();
@@ -451,7 +451,7 @@ LABEL_7:
v9 = 114;
_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, v19, 114, v18, v17, _vm->_graphicsManager.VESA_BUFFER, v19, 114);
_vm->_graphicsManager.Ajoute_Segment_Vesa(v19, 114, v19 + v18, v18 + 114);
- _vm->_objectsManager.BOBTOUS = 1;
+ _vm->_objectsManager.BOBTOUS = true;
}
if (_vm->_dialogsManager.Winventaire != g_PTRNUL)
_vm->_dialogsManager.Winventaire = _vm->_globals.dos_free2(_vm->_dialogsManager.Winventaire);
@@ -566,10 +566,10 @@ void DialogsManager::CHARGE_PARTIE() {
_vm->_eventsManager.VBL();
} while (_vm->_eventsManager.BMOUSE() != 1);
} while (!slotNumber);
- _vm->_objectsManager.SL_FLAG = 0;
+ _vm->_objectsManager.SL_FLAG = false;
_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x + 183, 60, 274, 353, _vm->_graphicsManager.VESA_BUFFER, _vm->_eventsManager.start_x + 183, 60);
_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_eventsManager.start_x + 183, 60, 457, 413);
- _vm->_objectsManager.BOBTOUS = 1;
+ _vm->_objectsManager.BOBTOUS = true;
_vm->_objectsManager.SL_SPR = _vm->_globals.dos_free2(_vm->_objectsManager.SL_SPR);
_vm->_objectsManager.SL_SPR2 = _vm->_globals.dos_free2(_vm->_objectsManager.SL_SPR2);
_vm->_objectsManager.SL_X = 0;
@@ -597,10 +597,10 @@ void DialogsManager::SAUVE_PARTIE() {
} while (!_vm->shouldQuit() && _vm->_eventsManager.BMOUSE() != 1);
} while (!_vm->shouldQuit() && !slotNumber);
- _vm->_objectsManager.SL_FLAG = 0;
+ _vm->_objectsManager.SL_FLAG = false;
_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x + 183, 60, 274, 353, _vm->_graphicsManager.VESA_BUFFER, _vm->_eventsManager.start_x + 183, 60);
_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_eventsManager.start_x + 183, 60, _vm->_eventsManager.start_x + 457, 413);
- _vm->_objectsManager.BOBTOUS = 1;
+ _vm->_objectsManager.BOBTOUS = true;
_vm->_objectsManager.SL_SPR = _vm->_globals.dos_free2(_vm->_objectsManager.SL_SPR);
_vm->_objectsManager.SL_SPR2 = _vm->_globals.dos_free2(_vm->_objectsManager.SL_SPR2);
_vm->_objectsManager.SL_X = 0;
@@ -681,7 +681,7 @@ void DialogsManager::LOAD_SAUVE(int a1) {
}
_vm->_graphicsManager.Capture_Mem(_vm->_graphicsManager.VESA_BUFFER, _vm->_objectsManager.SL_SPR, _vm->_eventsManager.start_x + 183, 60, 0x112u, 353);
- _vm->_objectsManager.SL_FLAG = 1;
+ _vm->_objectsManager.SL_FLAG = true;
_vm->_objectsManager.SL_MODE = a1;
_vm->_objectsManager.SL_X = 0;
_vm->_objectsManager.SL_Y = 0;
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index b935cb4d09..ba3c1da752 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -4,9 +4,9 @@
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
- * This program is _globals.FRee software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the _globals.FRee Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
@@ -15,7 +15,7 @@
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the _globals.FRee Software
+ * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
@@ -197,7 +197,7 @@ LABEL_13:
if (!*((byte *)_globals.SAUVEGARDE + 170)) {
_soundManager.WSOUND(3);
if (_globals.FR == 1)
- _graphicsManager.LOAD_IMAGE("fond_globals.FR");
+ _graphicsManager.LOAD_IMAGE("fondfr");
if (!_globals.FR)
_graphicsManager.LOAD_IMAGE("fondan");
if (_globals.FR == 2)
diff --git a/engines/hopkins/menu.cpp b/engines/hopkins/menu.cpp
index fc88bd7e4c..56b73c1fa1 100644
--- a/engines/hopkins/menu.cpp
+++ b/engines/hopkins/menu.cpp
@@ -4,9 +4,9 @@
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
- * This program is _globals.FRee software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the _globals.FRee Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
@@ -15,7 +15,7 @@
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the _globals.FRee Software
+ * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index ab86e20c37..bc592b34ce 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -76,8 +76,8 @@ ObjectsManager::ObjectsManager() {
MAX_DEPA1 = 0;
CH_TETE = 0;
T_RECTIF = 0;
- DESACTIVE = 0;
- DEUXPERSO = 0;
+ DESACTIVE = false;
+ DEUXPERSO = false;
PERX = PERY = 0;
PERI = 0;
RECALL = 0;
@@ -491,7 +491,7 @@ void ObjectsManager::AFF_SPRITES() {
_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_dialogsManager.inventairex, _vm->_dialogsManager.inventairey, _vm->_dialogsManager.inventairex + _vm->_dialogsManager.inventairel, _vm->_dialogsManager.inventairey + _vm->_dialogsManager.inventaireh);
}
- if (SL_FLAG == 1) {
+ if (SL_FLAG == true) {
_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager.VESA_BUFFER, SL_SPR, _vm->_eventsManager.start_x + 183, 60, 0x112u, 353);
if (SL_X && SL_Y)
_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, SL_SPR2, SL_X + _vm->_eventsManager.start_x + 300, SL_Y + 300, 0);
@@ -1254,7 +1254,7 @@ void ObjectsManager::AFF_BOB_ANIM() {
int idx = 0;
do {
++idx;
- if (idx <= 20 && PERSO_ON == 1) {
+ if (idx <= 20 && PERSO_ON == true) {
_vm->_globals.Bob[idx].field1C = 0;
continue;
}
@@ -1283,7 +1283,7 @@ void ObjectsManager::AFF_BOB_ANIM() {
_vm->_globals.Bob[idx].xp = (int16)READ_LE_UINT16(v20 + 2 * v24);
if (_vm->_globals.BL_ANIM[idx].v1 == 1)
_vm->_globals.Bob[idx].xp = _vm->_globals.BL_ANIM[idx].v2;
- if ( PERSO_ON == 1 && idx > 20 )
+ if ( PERSO_ON == true && idx > 20 )
_vm->_globals.Bob[idx].xp += _vm->_eventsManager.start_x;
_vm->_globals.Bob[idx].yp = (int16)READ_LE_UINT16(v20 + 2 * v24 + 2);
@@ -1324,7 +1324,7 @@ LABEL_38:
if (_vm->_globals.BL_ANIM[idx].v1 == 1)
_vm->_globals.Bob[idx].xp = _vm->_globals.BL_ANIM[idx].v2;
- if (PERSO_ON == 1 && idx > 20)
+ if (PERSO_ON == true && idx > 20)
_vm->_globals.Bob[idx].xp += _vm->_eventsManager.start_x;
_vm->_globals.Bob[idx].yp = (int16)READ_LE_UINT16(v21 + 2);
@@ -1348,7 +1348,7 @@ LABEL_38:
}
} while (idx != 35);
- if (!PERSO_ON && BOBTOUS == 1) {
+ if (!PERSO_ON && BOBTOUS == true) {
v26 = 0;
do {
v13 = v26;
@@ -1358,12 +1358,12 @@ LABEL_38:
} while (v26 != 35);
}
- BOBTOUS = 0;
+ BOBTOUS = false;
v27 = 0;
do {
++v27;
- if (v27 > 20 || PERSO_ON != 1) {
+ if (v27 > 20 || PERSO_ON != true) {
if (_vm->_globals.Bob[v27].field0 == 10) {
if (_vm->_globals.Bob[v27].field1C == 1) {
v14 = _vm->_globals.Bob[v27].field1E;
@@ -1704,11 +1704,11 @@ void ObjectsManager::VERIFZONE() {
|| _vm->_eventsManager.start_x >= v0
|| (v1 = _vm->_graphicsManager.ofscroll + 54, v0 >= v1)
|| (v1 = v2 - 1, (uint16)(v2 - 1) > 0x3Bu)) {
- if (FLAG_VISIBLE == 1)
+ if (FLAG_VISIBLE == true)
FLAG_VISIBLE_EFFACE = 4;
- FLAG_VISIBLE = 0;
+ FLAG_VISIBLE = false;
} else {
- FLAG_VISIBLE = 1;
+ FLAG_VISIBLE = true;
}
if (FORCEZONE == 1) {
_vm->_globals.compteur_71 = 100;
@@ -3064,7 +3064,7 @@ void ObjectsManager::CLEAR_ECRAN() {
verbe = 4;
NUMZONE = 0;
Vold_taille = 0;
- SPEED_FLAG = 0;
+ SPEED_FLAG = false;
SPEED_PTR = g_PTRNUL;
SPEED_X = 0;
SPEED_Y = 0;
@@ -4274,7 +4274,7 @@ void ObjectsManager::SPECIAL_JEU() {
_vm->_graphicsManager.ofscroll = 0;
_vm->_graphicsManager.NB_SCREEN();
_vm->_soundManager.SPECIAL_SOUND = 198;
- PERSO_ON = 1;
+ PERSO_ON = true;
_vm->_animationManager.NO_SEQ = true;
_vm->_animationManager.CLS_ANM = false;
_vm->_animationManager.PLAY_ANM("otage.ANM", 1, 24, 500);
@@ -4287,7 +4287,7 @@ void ObjectsManager::SPECIAL_JEU() {
_vm->_saveLoadManager.bload("TEMP1.SCR", _vm->_graphicsManager.VESA_SCREEN);
g_system->getSavefileManager()->removeSavefile("TEMP1.SCR");
- PERSO_ON = 0;
+ PERSO_ON = false;
memcpy(_vm->_graphicsManager.Palette, v1, 0x301u);
_vm->_graphicsManager.SHOW_PALETTE();
_vm->_globals.dos_free2(v1);
@@ -5808,9 +5808,9 @@ LABEL_70:
_vm->_graphicsManager.NOFADE = false;
SPRITE_OFF(0);
_vm->_globals.AFFLI = 0;
- if (DEUXPERSO == 1) {
+ if (DEUXPERSO == true) {
SPRITE_OFF(1);
- DEUXPERSO = 0;
+ DEUXPERSO = false;
}
if (!s3.empty())
_vm->_graphicsManager.FIN_VISU();
diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h
index 17b41c4b0b..60ace316da 100644
--- a/engines/hopkins/objects.h
+++ b/engines/hopkins/objects.h
@@ -101,8 +101,8 @@ public:
int MAX_DEPA1;
int CH_TETE;
int T_RECTIF;
- int DESACTIVE;
- int DEUXPERSO;
+ bool DESACTIVE;
+ bool DEUXPERSO;
int PERX, PERY;
int PERI;
int RECALL;
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index 43b0eafc86..57b691a129 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -245,7 +245,7 @@ LABEL_98:
}
LABEL_104:
if (*(a1 + 2) == 'B' && *(a1 + 3) == 'O' && *(a1 + 4) == 'B') {
- if (_vm->_objectsManager.DESACTIVE != 1) {
+ if (_vm->_objectsManager.DESACTIVE != true) {
v72 = *(a1 + 5);
v70 = *(a1 + 6);
v4 = *(a1 + 7);
@@ -279,8 +279,8 @@ LABEL_1141:
}
if (*(a1 + 2) == 'S') {
if (*(a1 + 3) == 'T' && *(a1 + 4) == 'P') {
- if (_vm->_objectsManager.DESACTIVE != 1) {
- _vm->_objectsManager.DEUXPERSO = 0;
+ if (_vm->_objectsManager.DESACTIVE != true) {
+ _vm->_objectsManager.DEUXPERSO = false;
v5 = *(a1 + 5);
v6 = (int16)READ_LE_UINT16(a1 + 8);
_vm->_objectsManager.PERX = (int16)READ_LE_UINT16(a1 + 6);
@@ -327,7 +327,7 @@ LABEL_1141:
34,
190);
_vm->_objectsManager.SPRITE_ON(1);
- _vm->_objectsManager.DEUXPERSO = 1;
+ _vm->_objectsManager.DEUXPERSO = true;
}
if (_vm->_globals.SAUVEGARDE->data[svField357] == 1
&& _vm->_globals.SAUVEGARDE->data[svField355] == 1
@@ -343,14 +343,14 @@ LABEL_1141:
20,
127);
_vm->_objectsManager.SPRITE_ON(1);
- _vm->_objectsManager.DEUXPERSO = 1;
+ _vm->_objectsManager.DEUXPERSO = true;
}
}
v1 = 1;
_vm->_objectsManager.CH_TETE = 0;
}
if (*(a1 + 2) == 'S' && *(a1 + 3) == 'T' && *(a1 + 4) == 'E') {
- if (_vm->_objectsManager.DESACTIVE != 1) {
+ if (_vm->_objectsManager.DESACTIVE != true) {
v7 = *(a1 + 5);
v70 = *(a1 + 6);
v8 = *(a1 + 7);
@@ -368,7 +368,7 @@ LABEL_1141:
}
}
if (*(a1 + 2) == 'B' && *(a1 + 3) == 'O' && *(a1 + 4) == 'F') {
- if (_vm->_objectsManager.DESACTIVE != 1)
+ if (_vm->_objectsManager.DESACTIVE != true)
_vm->_objectsManager.VBOB_OFF((int16)READ_LE_UINT16(a1 + 5));
v1 = 1;
}
@@ -2248,7 +2248,7 @@ LABEL_1141:
_vm->_globals.SAUVEGARDE->data[svField354] = 0;
_vm->_globals.SAUVEGARDE->data[svField356] = 0;
_vm->_globals.SAUVEGARDE->data[svField355] = 1;
- _vm->_objectsManager.DEUXPERSO = 1;
+ _vm->_objectsManager.DEUXPERSO = true;
_vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 373, 191, 3);
_vm->_objectsManager.SPRITE(_vm->_globals.TETE, v53->field0, v53->field1, 1, 3, v53->field4, 0, 20, 127);
_vm->_objectsManager.SPRITE_ON(1);
@@ -2264,14 +2264,14 @@ LABEL_1141:
if (v76 == 246) {
_vm->_objectsManager.SPRITE_OFF(0);
_vm->_objectsManager.OPTI_ONE(6, 0, 15, 0);
- _vm->_objectsManager.PERSO_ON = 1;
+ _vm->_objectsManager.PERSO_ON = true;
_vm->_graphicsManager.NB_SCREEN();
_vm->_animationManager.NO_SEQ = true;
_vm->_animationManager.PLAY_SEQ2("TUNNEL.SEQ", 1, 18, 20);
_vm->_animationManager.NO_SEQ = false;
_vm->_graphicsManager.NOFADE = true;
_vm->_graphicsManager.FADE_OUTW();
- _vm->_objectsManager.PERSO_ON = 0;
+ _vm->_objectsManager.PERSO_ON = false;
_vm->_globals.SORTIE = 100;
}
if (v76 == 55) {
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index 2e4438e6d7..3dc883c871 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -112,7 +112,7 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
if (!_vm->_graphicsManager.nbrligne)
_vm->_graphicsManager.ofscroll = 0;
_vm->_graphicsManager.NB_SCREEN();
- _vm->_objectsManager.PERSO_ON = 1;
+ _vm->_objectsManager.PERSO_ON = true;
CHERCHE_PAL(v3, 0);
CHERCHE_ANIM0(v3, 0);
ANIM_PERSO_INIT();
@@ -151,7 +151,7 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
_vm->_saveLoadManager.bload("TEMP.SCR", _vm->_graphicsManager.VESA_SCREEN);
g_system->getSavefileManager()->removeSavefile("TEMP.SCR");
- _vm->_objectsManager.PERSO_ON = 0;
+ _vm->_objectsManager.PERSO_ON = false;
_vm->_eventsManager.btsouris = v14;
_vm->_eventsManager.CHANGE_MOUSE(v14);
@@ -1246,14 +1246,14 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
v10 = 20 * (int16)READ_LE_UINT16((uint16 *)BUFFERPERSO + 42) + 110;
PCHERCHE = 20 * (int16)READ_LE_UINT16((uint16 *)BUFFERPERSO + 42) + 110;
_vm->_graphicsManager.NB_SCREEN();
- _vm->_objectsManager.PERSO_ON = 1;
+ _vm->_objectsManager.PERSO_ON = true;
CHERCHE_PAL(v10, 1);
CHERCHE_ANIM0(v10, 0);
v11 = _vm->_globals.COUCOU;
_vm->_globals.COUCOU = g_PTRNUL;
_vm->_globals.NOMARCHE = true;
_vm->_objectsManager.INILINK(v22);
- _vm->_objectsManager.PERSO_ON = 1;
+ _vm->_objectsManager.PERSO_ON = true;
_vm->_globals.GOACTION = 0;
_vm->_objectsManager.NUMZONE = -1;
ANIM_PERSO_INIT();
@@ -1295,10 +1295,10 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
while (v13 <= 44);
_vm->_globals.LIBERE_FICHIER(_vm->_globals.COUCOU);
_vm->_globals.COUCOU = v11;
- _vm->_objectsManager.DESACTIVE = 1;
+ _vm->_objectsManager.DESACTIVE = true;
_vm->_objectsManager.INILINK(v20);
_vm->_graphicsManager.INI_ECRAN2(v20);
- _vm->_objectsManager.DESACTIVE = 0;
+ _vm->_objectsManager.DESACTIVE = false;
_vm->_globals.NOMARCHE = false;
if (_vm->_globals.SORTIE == 101)
_vm->_globals.SORTIE = 0;
@@ -1306,7 +1306,7 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
_vm->_saveLoadManager.bload("TEMP.SCR", _vm->_graphicsManager.VESA_SCREEN);
g_system->getSavefileManager()->removeSavefile("TEMP.SCR");
- _vm->_objectsManager.PERSO_ON = 0;
+ _vm->_objectsManager.PERSO_ON = false;
_vm->_eventsManager.btsouris = 4;
_vm->_eventsManager.CHANGE_MOUSE(4);
_vm->_graphicsManager.SETCOLOR3(253, 100, 100, 100);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 22:23:19 +0000