aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/hopkins/anim.cpp6
-rw-r--r--engines/hopkins/files.cpp22
-rw-r--r--engines/hopkins/font.cpp16
-rw-r--r--engines/hopkins/globals.cpp125
-rw-r--r--engines/hopkins/globals.h3
-rw-r--r--engines/hopkins/graphics.cpp8
-rw-r--r--engines/hopkins/lines.cpp42
-rw-r--r--engines/hopkins/objects.cpp176
-rw-r--r--engines/hopkins/talk.cpp22
9 files changed, 215 insertions, 205 deletions
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index 4b16811d65..8950437998 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -777,13 +777,13 @@ void AnimationManager::CHARGE_ANIM(const Common::String &animName) {
void AnimationManager::CLEAR_ANIM() {
for (int idx = 0; idx < 35; ++idx) {
- if (_vm->_globals.Bqe_Anim[idx].data != PTRNUL)
+ if (_vm->_globals.Bqe_Anim[idx].data != g_PTRNUL)
_vm->_globals.Bqe_Anim[idx].data = _vm->_globals.dos_free2(_vm->_globals.Bqe_Anim[idx].data);
_vm->_globals.Bqe_Anim[idx].field4 = 0;
}
for (int idx = 0; idx < 8; ++idx) {
- if (_vm->_globals.Bank[idx].data != PTRNUL)
+ if (_vm->_globals.Bank[idx].data != g_PTRNUL)
_vm->_globals.Bank[idx].data = _vm->_globals.dos_free2(_vm->_globals.Bank[idx].data);
_vm->_globals.Bank[idx].field4 = 0;
_vm->_globals.Bank[idx].filename1 = "";
@@ -937,7 +937,7 @@ void AnimationManager::RECHERCHE_ANIM(const byte *data, int idx, int nbytes) {
if (nbytes < v6) {
_vm->_globals.Bqe_Anim[idx].field4 = 0;
- _vm->_globals.Bqe_Anim[idx].data = PTRNUL;
+ _vm->_globals.Bqe_Anim[idx].data = g_PTRNUL;
}
++v6;
diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 87c1490ea2..de501d884c 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -194,7 +194,7 @@ void FileManager::CONSTRUIT_FICHIER(const Common::String &hop, const Common::Str
byte *FileManager::LIBERE_FICHIER(byte *ptr) {
free(ptr);
- return PTRNUL;
+ return g_PTRNUL;
}
byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
@@ -208,7 +208,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
case 1:
CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_INI.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
- return PTRNUL;
+ return g_PTRNUL;
ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_INI.RES");
@@ -217,7 +217,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
case 2:
CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_REP.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
- return PTRNUL;
+ return g_PTRNUL;
ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_REP.RES");
@@ -226,7 +226,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
case 3:
CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_LIN.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
- return PTRNUL;
+ return g_PTRNUL;
ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_LIN.RES");
@@ -235,7 +235,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
case 4:
CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_ANI.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
- return PTRNUL;
+ return g_PTRNUL;
ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_ANI.RES");
@@ -244,7 +244,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
case 5:
CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_PER.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
- return PTRNUL;
+ return g_PTRNUL;
ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_PER.RES");
@@ -253,7 +253,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
case 6:
CONSTRUIT_FICHIER(_vm->_globals.HOPIMAGE, "PIC.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
- return PTRNUL;
+ return g_PTRNUL;
ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
break;
@@ -261,7 +261,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
case 7:
CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_SAN.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
- return PTRNUL;
+ return g_PTRNUL;
ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
break;
@@ -269,7 +269,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
case 8:
CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_SLI.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
- return PTRNUL;
+ return g_PTRNUL;
ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
break;
@@ -288,7 +288,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
}
if (!f.exists(_vm->_globals.NFICHIER))
- return PTRNUL;
+ return g_PTRNUL;
ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
break;
@@ -331,7 +331,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
f.seek(_vm->_globals.CAT_POSI);
byte *catData = _vm->_globals.dos_malloc2(_vm->_globals.CAT_TAILLE);
- if (catData == PTRNUL)
+ if (catData == g_PTRNUL)
error("CHARGE_FICHIER");
bload_it(f, catData, _vm->_globals.CAT_TAILLE);
diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp
index 919d55a3d5..f8d18a24c1 100644
--- a/engines/hopkins/font.cpp
+++ b/engines/hopkins/font.cpp
@@ -58,9 +58,9 @@ void FontManager::TEXTE_ON(int idx) {
txt.field0 = 1;
txt.field408 = 0;
- if (txt.field400 != PTRNUL) {
+ if (txt.field400 != g_PTRNUL) {
_vm->_globals.dos_free2(txt.field400);
- txt.field400 = PTRNUL;
+ txt.field400 = g_PTRNUL;
}
}
@@ -73,9 +73,9 @@ void FontManager::TEXTE_OFF(int idx) {
txt.field0 = 0;
txt.field408 = 0;
- if (txt.field400 != PTRNUL) {
+ if (txt.field400 != g_PTRNUL) {
_vm->_globals.dos_free2(txt.field400);
- txt.field400 = PTRNUL;
+ txt.field400 = g_PTRNUL;
}
}
@@ -250,7 +250,7 @@ void FontManager::BOITE(int idx, int fileIndex, const Common::String &filename,
v69 = 2048;
f.seek(Index[fileIndex]);
texte_tmp = _vm->_globals.dos_malloc2(2058);
- if (texte_tmp == PTRNUL)
+ if (texte_tmp == g_PTRNUL)
error("temporary text");
f.read(texte_temp, 2048);
@@ -475,7 +475,7 @@ LABEL_57:
v49 = v51 * v53;
ptrd = _vm->_globals.dos_malloc2(v51 * v53);
- if (ptrd == PTRNUL)
+ if (ptrd == g_PTRNUL)
error("Error allocating block (%d)", v49);
}
@@ -512,12 +512,12 @@ LABEL_57:
if (v32 == 6 || v32 == 1 || v32 == 3 || v32 == 5) {
v33 = idx;
- if (Txt[v33].field400 != PTRNUL)
+ if (Txt[v33].field400 != g_PTRNUL)
Txt[v33].field400 = _vm->_globals.dos_free2(Txt[v33].field400);
v50 = v52 * v54;
ptre = dos_malloc2(v50 + 20);
- if (ptre == PTRNUL)
+ if (ptre == g_PTRNUL)
error("Error allocating block (%d)", v50);
}
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index 9d5de109d7..a02e47dbf0 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -30,10 +30,16 @@
namespace Hopkins {
+byte *g_PTRNUL;
+
Globals::Globals() {
+ // Set up the special g_PTRNUL variable
+ g_PTRNUL = (byte *)malloc(16);
+ strcpy((char *)g_PTRNUL, "POINTERNULL");
+
// Initialise array properties
for (int i = 0; i < 6; ++i)
- CACHE_BANQUE[i] = PTRNUL;
+ CACHE_BANQUE[i] = g_PTRNUL;
for (int i = 0; i < 106; ++i)
Common::fill((byte *)&ZONEP[i], (byte *)&ZONEP[i] + sizeof(ZonePItem), 0);
for (int i = 0; i < 100; ++i)
@@ -211,24 +217,26 @@ Globals::Globals() {
Globals::~Globals() {
free(ICONE);
- free(BUF_ZONE);
- free(CACHE_BANQUE[6]);
- free(Winventaire);
- free(texte_tmp);
- free(SPRITE_ECRAN);
- free(SAUVEGARDE);
- free(BUFFERTAPE);
- free(Bufferobjet);
- free(inventaire2);
- free(GESTE);
- free(INVENTAIRE_OBJET);
- free(FORETSPR);
- free(COUCOU);
- free(chemin);
- free(cache_souris);
- free(Bufferdecor);
- free(ADR_FICHIER_OBJ);
- free(PERSO);
+ dos_free2(BUF_ZONE);
+ dos_free2(CACHE_BANQUE[6]);
+ dos_free2(Winventaire);
+ dos_free2(texte_tmp);
+ dos_free2(SPRITE_ECRAN);
+ dos_free2((byte *)SAUVEGARDE);
+ dos_free2(BUFFERTAPE);
+ dos_free2(Bufferobjet);
+ dos_free2(inventaire2);
+ dos_free2(GESTE);
+ dos_free2(INVENTAIRE_OBJET);
+ dos_free2(FORETSPR);
+ dos_free2(COUCOU);
+ dos_free2(chemin);
+ dos_free2(cache_souris);
+ dos_free2(Bufferdecor);
+ dos_free2(ADR_FICHIER_OBJ);
+ dos_free2(PERSO);
+
+ free(g_PTRNUL);
}
void Globals::setParent(HopkinsEngine *vm) {
@@ -267,14 +275,14 @@ void Globals::clearAll() {
// to point to. For now, we're seeing if the NULL value will do as well
for (int idx = 0; idx < 6; ++idx)
- CACHE_BANQUE[idx] = PTRNUL;
+ CACHE_BANQUE[idx] = g_PTRNUL;
nbrligne = 80;
INIT_ANIM();
- texte_tmp = PTRNUL;
+ texte_tmp = g_PTRNUL;
texte_long = 0;
- police = PTRNUL;
+ police = g_PTRNUL;
police_h = 0;
police_l = 0;
hauteur_boite = 0;
@@ -283,15 +291,15 @@ void Globals::clearAll() {
_vm->_fontManager.clearAll();
INIT_VBOB();
- ADR_FICHIER_OBJ = PTRNUL;
+ ADR_FICHIER_OBJ = g_PTRNUL;
NUM_FICHIER_OBJ = 0;
- Bufferdecor = PTRNUL;
- Bufferobjet = PTRNUL;
- Winventaire = PTRNUL;
- inventaire2 = PTRNUL;
- COUCOU = PTRNUL;
- SPRITE_ECRAN = PTRNUL;
- SAUVEGARDE = (Sauvegarde *)PTRNUL;
+ Bufferdecor = g_PTRNUL;
+ Bufferobjet = g_PTRNUL;
+ Winventaire = g_PTRNUL;
+ inventaire2 = g_PTRNUL;
+ COUCOU = g_PTRNUL;
+ SPRITE_ECRAN = g_PTRNUL;
+ SAUVEGARDE = (Sauvegarde *)g_PTRNUL;
OBJET_EN_COURS = 0;
for (int idx = 0; idx < 105; ++idx) {
@@ -300,11 +308,11 @@ void Globals::clearAll() {
ZONEP[idx].field4 = 0;
}
- essai0 = PTRNUL;
- essai1 = PTRNUL;
- essai2 = PTRNUL;
- BufLig = PTRNUL;
- chemin = PTRNUL;
+ essai0 = g_PTRNUL;
+ essai1 = g_PTRNUL;
+ essai2 = g_PTRNUL;
+ BufLig = g_PTRNUL;
+ chemin = g_PTRNUL;
for (int idx = 0; idx < 400; ++idx) {
_vm->_linesManager.Ligne[idx].field0 = 0;
@@ -312,11 +320,11 @@ void Globals::clearAll() {
_vm->_linesManager.Ligne[idx].field4 = 0;
_vm->_linesManager.Ligne[idx].field6 = 0;
_vm->_linesManager.Ligne[idx].field8 = 0;
- _vm->_linesManager.Ligne[idx].fieldC = PTRNUL;
+ _vm->_linesManager.Ligne[idx].fieldC = g_PTRNUL;
_vm->_linesManager.LigneZone[idx].field0 = 0;
_vm->_linesManager.LigneZone[idx].field2 = 0;
- _vm->_linesManager.LigneZone[idx].field4 = PTRNUL;
+ _vm->_linesManager.LigneZone[idx].field4 = g_PTRNUL;
}
for (int idx = 0; idx < 100; ++idx) {
@@ -324,7 +332,7 @@ void Globals::clearAll() {
}
texte_long = 0;
- texte_tmp = PTRNUL;
+ texte_tmp = g_PTRNUL;
BUFFERTAPE = dos_malloc2(85000);
SAUVEGARDE = (Sauvegarde *)malloc(sizeof(Sauvegarde));
@@ -340,12 +348,12 @@ void Globals::clearAll() {
Bufferobjet = dos_malloc2(2500);
INVENTAIRE_OBJET = dos_malloc2(2500);
- ADR_FICHIER_OBJ = PTRNUL;
- FORETSPR = PTRNUL;
+ ADR_FICHIER_OBJ = g_PTRNUL;
+ FORETSPR = g_PTRNUL;
FORET = 0;
cache_souris = dos_malloc2(2500);
- GESTE = PTRNUL;
+ GESTE = g_PTRNUL;
GESTE_FLAG = false;
}
@@ -728,12 +736,12 @@ void Globals::HOPKINS_DATA() {
void Globals::INIT_ANIM() {
for (int idx = 0; idx < 35; ++idx) {
- Bqe_Anim[idx].data = PTRNUL;
+ Bqe_Anim[idx].data = g_PTRNUL;
Bqe_Anim[idx].field4 = 0;
}
for (int idx = 0; idx < 8; ++idx) {
- Bank[idx].data = PTRNUL;
+ Bank[idx].data = g_PTRNUL;
Bank[idx].field4 = 0;
Bank[idx].filename1 = "";
Bank[idx].fileHeader = 0;
@@ -749,9 +757,9 @@ void Globals::INIT_VBOB() {
VBob[idx].field8 = 0;
VBob[idx].fieldA = 0;
VBob[idx].fieldC = 0;
- VBob[idx].field10 = PTRNUL;
- VBob[idx].field0 = PTRNUL;
- VBob[idx].field1C = PTRNUL;
+ VBob[idx].field10 = g_PTRNUL;
+ VBob[idx].field0 = g_PTRNUL;
+ VBob[idx].field1C = g_PTRNUL;
}
}
@@ -762,9 +770,9 @@ void Globals::CLEAR_VBOB() {
VBob[idx].field8 = 0;
VBob[idx].fieldA = 0;
VBob[idx].fieldC = 0;
- VBob[idx].field10 = PTRNUL;
- VBob[idx].field0 = PTRNUL;
- VBob[idx].field1C = PTRNUL;
+ VBob[idx].field10 = g_PTRNUL;
+ VBob[idx].field0 = g_PTRNUL;
+ VBob[idx].field1C = g_PTRNUL;
}
}
@@ -790,18 +798,19 @@ void Globals::CHARGE_OBJET() {
byte *Globals::dos_malloc2(int count) {
byte *result = (byte *)malloc(count);
if (!result)
- result = PTRNUL;
+ result = g_PTRNUL;
return result;
}
byte *Globals::dos_free2(byte *p) {
- free(p);
- return PTRNUL;
+ if (p != g_PTRNUL)
+ free(p);
+ return g_PTRNUL;
}
byte *Globals::LIBERE_FICHIER(byte *p) {
dos_free2(p);
- return PTRNUL;
+ return g_PTRNUL;
}
void Globals::RESET_CACHE() {
@@ -809,13 +818,13 @@ void Globals::RESET_CACHE() {
for (int idx = 1; idx <= 5; ++idx) {
dataP = CACHE_BANQUE[idx];
- if (dataP != PTRNUL && dataP)
+ if (dataP != g_PTRNUL && dataP)
CACHE_BANQUE[idx] = dos_free2(CACHE_BANQUE[idx]);
- CACHE_BANQUE[idx] = PTRNUL;
+ CACHE_BANQUE[idx] = g_PTRNUL;
}
for (int idx = 0; idx <= 20; ++idx) {
- Cache[idx].fieldC = PTRNUL;
+ Cache[idx].fieldC = g_PTRNUL;
Cache[idx].field0 = 0;
Cache[idx].field4 = 0;
Cache[idx].field2 = 0;
@@ -847,7 +856,7 @@ void Globals::CACHE_ADD(int idx) {
}
void Globals::CHARGE_CACHE(const Common::String &file) {
- byte *v2 = PTRNUL;
+ byte *v2 = g_PTRNUL;
int v4;
int v5;
int v6;
@@ -883,7 +892,7 @@ void Globals::CHARGE_CACHE(const Common::String &file) {
Cache[v6].field0 = v4;
Cache[v6].field4 = v5;
Cache[v6].field12 = 1;
- if (spriteData == PTRNUL) {
+ if (spriteData == g_PTRNUL) {
Cache[v14].fieldA = 0;
} else {
v8 = _vm->_objectsManager.Get_Largeur(spriteData, v11);
diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index 81cb05184f..70b62a5d71 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -470,7 +470,8 @@ public:
void B_CACHE_OFF(int idx);
};
-#define PTRNUL (byte *)NULL
+// Global null pointer
+extern byte *g_PTRNUL;
} // End of namespace Hopkins
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index 851768a6b9..04c43c966b 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -2343,13 +2343,13 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int a2) {
v13 = file + ".ini";
ptr = _vm->_fileManager.RECHERCHE_CAT(v13, 1);
- if (PTRNUL == ptr) {
+ if (g_PTRNUL == ptr) {
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, v13);
ptr = _vm->_fileManager.CHARGE_FICHIER(_vm->_globals.NFICHIER);
}
if (!a2) {
v13 = file + ".spr";
- if (PTRNUL != _vm->_globals.SPRITE_ECRAN)
+ if (g_PTRNUL != _vm->_globals.SPRITE_ECRAN)
_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.LIBERE_FICHIER(_vm->_globals.SPRITE_ECRAN);
if (!_vm->_globals.NOSPRECRAN) {
_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.RECHERCHE_CAT(v13, 8);
@@ -2384,13 +2384,13 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int a2) {
}
_vm->_globals.dos_free2(ptr);
if (a2 != 1) {
- if (PTRNUL != _vm->_globals.COUCOU)
+ if (g_PTRNUL != _vm->_globals.COUCOU)
_vm->_globals.COUCOU = _vm->_globals.dos_free2(_vm->_globals.COUCOU);
v13 = file + ".rep";
byte *dataP = _vm->_fileManager.RECHERCHE_CAT(v13, 2);
_vm->_globals.COUCOU = dataP;
- if (PTRNUL == dataP) {
+ if (g_PTRNUL == dataP) {
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, v13);
dataP = _vm->_fileManager.CHARGE_FICHIER(_vm->_globals.NFICHIER);
_vm->_globals.COUCOU = dataP;
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
index bfd47e9699..6c499d0c37 100644
--- a/engines/hopkins/lines.cpp
+++ b/engines/hopkins/lines.cpp
@@ -130,10 +130,10 @@ int LinesManager::OPTI_ZONE(int a1, int a2, int a3) {
void LinesManager::RETIRE_LIGNE_ZONE(int idx) {
if (idx > 400)
error("Attempting to add a line obstacle > MAX_LIGNE.");
- if (_vm->_linesManager.LigneZone[idx].field4 != PTRNUL)
+ if (_vm->_linesManager.LigneZone[idx].field4 != g_PTRNUL)
_vm->_globals.dos_free2(_vm->_linesManager.LigneZone[idx].field4);
- _vm->_linesManager.LigneZone[idx].field4 = PTRNUL;
+ _vm->_linesManager.LigneZone[idx].field4 = g_PTRNUL;
}
@@ -160,7 +160,7 @@ void LinesManager::AJOUTE_LIGNE_ZONE(int idx, int a2, int a3, int a4, int a5, in
if (idx > 400)
error("Attempting to add a line obstacle > MAX_LIGNE.");
v7 = idx;
- if (LigneZone[v7].field4 != PTRNUL)
+ if (LigneZone[v7].field4 != g_PTRNUL)
LigneZone[v7].field4 = _vm->_globals.dos_free2(LigneZone[v7].field4);
v8 = a2 - a4;
if (a2 - a4 < 0)
@@ -177,7 +177,7 @@ void LinesManager::AJOUTE_LIGNE_ZONE(int idx, int a2, int a3, int a4, int a5, in
v10 = _vm->_globals.dos_malloc2(4 * v20 + 8);
v11 = idx;
LigneZone[v11].field4 = v10;
- if (PTRNUL == v10)
+ if (g_PTRNUL == v10)
error("AJOUTE LIGNE ZONE");
v12 = LigneZone[v11].field4;
@@ -221,16 +221,16 @@ void LinesManager::RESET_OBSTACLE() {
for (int idx =0; idx < 400; ++idx) {
RETIRE_LIGNE(idx);
Ligne[idx].field0 = 0;
- Ligne[idx].fieldC = PTRNUL;
+ Ligne[idx].fieldC = g_PTRNUL;
}
}
void LinesManager::RETIRE_LIGNE(int idx) {
if (idx > 400)
error("Attempting to add a line obstacle > MAX_LIGNE.");
- if (Ligne[idx].fieldC != PTRNUL)
+ if (Ligne[idx].fieldC != g_PTRNUL)
_vm->_globals.dos_free2(Ligne[idx].fieldC);
- Ligne[idx].fieldC = PTRNUL;
+ Ligne[idx].fieldC = g_PTRNUL;
}
void LinesManager::AJOUTE_LIGNE(int idx, int a2, int a3, int a4, int a5, int a6, int a7) {
@@ -262,7 +262,7 @@ void LinesManager::AJOUTE_LIGNE(int idx, int a2, int a3, int a4, int a5, int a6,
if (TOTAL_LIGNES < idx)
TOTAL_LIGNES = idx;
- if (Ligne[idx].fieldC != PTRNUL)
+ if (Ligne[idx].fieldC != g_PTRNUL)
_vm->_globals.dos_free2(Ligne[idx].fieldC);
v7 = a3 - a5;
if (a3 - a5 < 0)
@@ -277,7 +277,7 @@ void LinesManager::AJOUTE_LIGNE(int idx, int a2, int a3, int a4, int a5, int a6,
v34 = v8;
v10 = _vm->_globals.dos_malloc2(4 * v34 + 8);
Ligne[idx].fieldC = v10;
- if (v10 == PTRNUL)
+ if (v10 == g_PTRNUL)
error("AJOUTE LIGNE OBSTACLE");
v32 = Ligne[idx].fieldC;
v36 = 1000 * v8;
@@ -412,7 +412,7 @@ LABEL_29:
v19 = a2 - 4;
while (1) {
v7 = Ligne[v6].fieldC;
- if (v7 != PTRNUL) {
+ if (v7 != g_PTRNUL) {
v23 = 1;
v8 = 2 * Ligne[v6].field0;
v9 = READ_LE_UINT16(v7);
@@ -503,7 +503,7 @@ LABEL_47:
v19 = a2 - 10;
while (1) {
v7 = Ligne[v6].fieldC;
- if (PTRNUL != v7) {
+ if (g_PTRNUL != v7) {
v23 = 1;
v8 = 2 * Ligne[v6].field0;
v9 = READ_LE_UINT16(v7);
@@ -1342,14 +1342,14 @@ LABEL_112:
v86 = v92 - 1;
v11 = 2 * Ligne[v92 - 1].field0;
v12 = Ligne[v92 - 1].fieldC;
- if (v12 == PTRNUL)
+ if (v12 == g_PTRNUL)
break;
while (READ_LE_UINT16(v12 + 2 * v11 - 4) != v98 || v97 != READ_LE_UINT16(v12 + 2 * v11 - 2)) {
--v86;
if (_vm->_objectsManager.DERLIGNE - 1 != v86) {
v11 = 2 * Ligne[v86].field0;
v12 = Ligne[v86].fieldC;
- if (v12 != PTRNUL)
+ if (v12 != g_PTRNUL)
continue;
}
goto LABEL_11;
@@ -1368,7 +1368,7 @@ LABEL_11:
v87 = v91 + 1;
v15 = 2 * Ligne[v91 + 1].field0;
v16 = Ligne[v91 + 1].fieldC;
- if (PTRNUL == v16)
+ if (g_PTRNUL == v16)
break;
while (1) {
v65 = v15;
@@ -1381,7 +1381,7 @@ LABEL_11:
if (v87 != TOTAL_LIGNES + 1) {
v15 = 2 * Ligne[v87].field0;
v16 = Ligne[v87].fieldC;
- if (v16 != PTRNUL)
+ if (v16 != g_PTRNUL)
continue;
}
goto LABEL_17;
@@ -1454,7 +1454,7 @@ LABEL_17:
for (i = v92; i < v91 + 1; ++i) {
v27 = 2 * Ligne[i].field0;
v28 = Ligne[i].fieldC;
- if (PTRNUL == v28)
+ if (g_PTRNUL == v28)
error("erreur dans da routine genial");
v29 = *(uint16 *)v28;
v30 = READ_LE_UINT16(v28 + 2);
@@ -1830,7 +1830,7 @@ byte *LinesManager::PARCOURS2(int a1, int a2, int a3, int a4) {
if (v7 < 0)
v7 = -v7;
if (v7 <= 4)
- return PTRNUL;
+ return g_PTRNUL;
}
}
}
@@ -1842,10 +1842,10 @@ byte *LinesManager::PARCOURS2(int a1, int a2, int a3, int a4) {
if (v9 < 0)
v9 = -v9;
if (v9 <= 4)
- return PTRNUL;
+ return g_PTRNUL;
}
if (_vm->_globals.old_z_69 > 0 && _vm->_objectsManager.NUMZONE > 0 && _vm->_globals.old_z_69 == _vm->_objectsManager.NUMZONE)
- return PTRNUL;
+ return g_PTRNUL;
}
_vm->_globals.NOT_VERIF = 0;
_vm->_globals.old_z_69 = _vm->_objectsManager.NUMZONE;
@@ -1871,7 +1871,7 @@ byte *LinesManager::PARCOURS2(int a1, int a2, int a3, int a4) {
if (v11 < 0)
v11 = -v11;
if (v11 <= 3)
- return PTRNUL;
+ return g_PTRNUL;
}
v12 = 0;
error("TODO: Fix v141/v136 - they look like arrays, not a single int");
@@ -1987,7 +1987,7 @@ error("TODO: Fix v141/v136 - they look like arrays, not a single int");
if (v145 < 0)
v135 = 1300;
if (v142 == -1 && v143 == -1 && v144 == -1 && v145 == -1)
- return PTRNUL;
+ return g_PTRNUL;
v31 = 0;
if (v144 != -1 && v132 >= v134 && v133 >= v134 && v135 >= v134) {
v121 = v144;
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index 0d509b5b14..617f9cb6e7 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -48,11 +48,11 @@ ObjectsManager::ObjectsManager() {
g_old_x = g_old_y = 0;
FLAG_VISIBLE_EFFACE = 0;
Winventaire = NULL;
- inventaire2 = PTRNUL;
- SL_SPR = PTRNUL;
- SL_SPR2 = PTRNUL;
- sprite_ptr = PTRNUL;
- S_old_spr = PTRNUL;
+ inventaire2 = g_PTRNUL;
+ SL_SPR = g_PTRNUL;
+ SL_SPR2 = g_PTRNUL;
+ sprite_ptr = g_PTRNUL;
+ S_old_spr = g_PTRNUL;
PERSO_ON = false;
SL_FLAG = false;
SL_MODE = false;
@@ -74,7 +74,7 @@ ObjectsManager::ObjectsManager() {
SPEED_FLAG = false;
SPEED_X = SPEED_Y = 0;
SPEED_IMAGE = 0;
- SPEED_PTR = PTRNUL;
+ SPEED_PTR = g_PTRNUL;
DERLIGNE = 0;
g_old_sens = 0;
A_ANIM = 0;
@@ -126,7 +126,7 @@ byte *ObjectsManager::CAPTURE_OBJET(int objIndex, int mode) {
if (mode == 1)
++val2;
if (val1 != _vm->_globals.NUM_FICHIER_OBJ) {
- if (_vm->_globals.ADR_FICHIER_OBJ != PTRNUL)
+ if (_vm->_globals.ADR_FICHIER_OBJ != g_PTRNUL)
ObjectsManager::DEL_FICHIER_OBJ();
if (val1 == 1) {
_vm->_fileManager.CONSTRUIT_SYSTEM("OBJET1.SPR");
@@ -143,7 +143,7 @@ byte *ObjectsManager::CAPTURE_OBJET(int objIndex, int mode) {
switch (mode) {
case 0:
dataP = _vm->_globals.dos_malloc2(height * width);
- if (dataP == PTRNUL)
+ if (dataP == g_PTRNUL)
error("CAPTURE_OBJET");
ObjectsManager::capture_mem_sprite(_vm->_globals.ADR_FICHIER_OBJ, dataP, val2);
@@ -268,11 +268,11 @@ int ObjectsManager::sprite_alone(const byte *objectData, byte *sprite, int objIn
byte *ObjectsManager::DEL_FICHIER_OBJ() {
_vm->_globals.NUM_FICHIER_OBJ = 0;
- if (_vm->_globals.ADR_FICHIER_OBJ != PTRNUL)
+ if (_vm->_globals.ADR_FICHIER_OBJ != g_PTRNUL)
_vm->_globals.ADR_FICHIER_OBJ = _vm->_fileManager.LIBERE_FICHIER(_vm->_globals.ADR_FICHIER_OBJ);
- byte *result = PTRNUL;
- _vm->_globals.ADR_FICHIER_OBJ = PTRNUL;
+ byte *result = g_PTRNUL;
+ _vm->_globals.ADR_FICHIER_OBJ = g_PTRNUL;
return result;
}
@@ -594,7 +594,7 @@ void ObjectsManager::BOB_ZERO(int idx) {
Liste2Item &item = _vm->_globals.Liste2[idx];
bob.field0 = 0;
- bob.field4 = PTRNUL;
+ bob.field4 = g_PTRNUL;
bob.field8 = 0;
bob.fieldA = 0;
bob.fieldC = 0;
@@ -603,7 +603,7 @@ void ObjectsManager::BOB_ZERO(int idx) {
bob.field12 = 0;
bob.field14 = 0;
bob.field16 = 0;
- bob.field18 = PTRNUL;
+ bob.field18 = g_PTRNUL;
bob.field1A = 0;
bob.field1C = 0;
bob.field1E = 0;
@@ -614,7 +614,7 @@ void ObjectsManager::BOB_ZERO(int idx) {
bob.field28 = 0;
bob.field2A = 0;
bob.field2C = 0;
- bob.field30 = PTRNUL;
+ bob.field30 = g_PTRNUL;
bob.field34 = 0;
bob.field36 = 0;
bob.field38 = 0;
@@ -1336,7 +1336,7 @@ void ObjectsManager::AFF_BOB_ANIM() {
v1 = _vm->_globals.Bob[idx].field20;
if (v1 == -1)
v1 = 50;
- if (_vm->_globals.Bob[idx].field18 == PTRNUL || _vm->_globals.Bob[idx].field16 || v1 <= 0)
+ if (_vm->_globals.Bob[idx].field18 == g_PTRNUL || _vm->_globals.Bob[idx].field16 || v1 <= 0)
goto LABEL_38;
v2 = _vm->_globals.Bob[idx].field14;
@@ -1513,19 +1513,19 @@ void ObjectsManager::AFF_VBOB() {
_vm->_globals.VBob[idx].field6 + width,
height + _vm->_globals.VBob[idx].field8);
- if (PTRNUL != _vm->_globals.VBob[idx].field10)
+ if (g_PTRNUL != _vm->_globals.VBob[idx].field10)
_vm->_globals.dos_free2(_vm->_globals.VBob[idx].field10);
_vm->_globals.VBob[idx].field4 = 0;
- _vm->_globals.VBob[idx].field10 = PTRNUL;
- _vm->_globals.VBob[idx].field0 = PTRNUL;
+ _vm->_globals.VBob[idx].field10 = g_PTRNUL;
+ _vm->_globals.VBob[idx].field0 = g_PTRNUL;
_vm->_globals.VBob[idx].field6 = 0;
_vm->_globals.VBob[idx].field8 = 0;
_vm->_globals.VBob[idx].field14 = 0;
_vm->_globals.VBob[idx].field16 = 0;
_vm->_globals.VBob[idx].fieldA = 0;
_vm->_globals.VBob[idx].field18 = 0;
- _vm->_globals.VBob[idx].field1C = PTRNUL;
+ _vm->_globals.VBob[idx].field1C = g_PTRNUL;
}
if (_vm->_globals.VBob[idx].field4 == 3) {
@@ -1549,10 +1549,10 @@ void ObjectsManager::AFF_VBOB() {
_vm->_globals.VBob[idx].field4 = 1;
_vm->_globals.VBob[idx].field1C = _vm->_globals.VBob[idx].field0;
- if (PTRNUL != _vm->_globals.VBob[idx].field10)
+ if (g_PTRNUL != _vm->_globals.VBob[idx].field10)
_vm->_globals.dos_free2(_vm->_globals.VBob[idx].field10);
- _vm->_globals.VBob[idx].field10 = PTRNUL;
+ _vm->_globals.VBob[idx].field10 = g_PTRNUL;
_vm->_globals.VBob[idx].field14 = _vm->_globals.VBob[idx].field6;
_vm->_globals.VBob[idx].field16 = _vm->_globals.VBob[idx].field8;
_vm->_globals.VBob[idx].field18 = _vm->_globals.VBob[idx].fieldA;
@@ -1562,7 +1562,7 @@ void ObjectsManager::AFF_VBOB() {
width = Get_Largeur(_vm->_globals.VBob[idx].field0, _vm->_globals.VBob[idx].fieldA);
height = Get_Hauteur(_vm->_globals.VBob[idx].field0, _vm->_globals.VBob[idx].fieldA);
- if (PTRNUL != _vm->_globals.VBob[idx].field10)
+ if (g_PTRNUL != _vm->_globals.VBob[idx].field10)
_vm->_globals.dos_free2(_vm->_globals.VBob[idx].field10);
byte *surface = _vm->_globals.dos_malloc2(height * width);
@@ -1624,8 +1624,8 @@ void ObjectsManager::CLEAR_SPR() {
idx = 0;
do {
- Sprite[idx].field1C = PTRNUL;
- Sprite[idx].spriteData = PTRNUL;
+ Sprite[idx].field1C = g_PTRNUL;
+ Sprite[idx].spriteData = g_PTRNUL;
Sprite[idx].field0 = 0;
++idx;
} while (idx <= 4);
@@ -1659,7 +1659,7 @@ void ObjectsManager::SPRITE(const byte *spriteData, int a2, int a3, int idx, int
Sprite[idx].fieldC = a6;
Sprite[idx].field12 = a8;
Sprite[idx].field14 = a9;
- Sprite[idx].field1C = PTRNUL;
+ Sprite[idx].field1C = g_PTRNUL;
Sprite[idx].field20 = 0;
Sprite[idx].field24 = 0;
Sprite[idx].field26 = 0;
@@ -1698,9 +1698,9 @@ void ObjectsManager::SPRITE2(const byte *spriteData, int idx, byte *a3, int a4,
void ObjectsManager::SPRITE_OFF(int idx) {
Sprite[idx].field0 = 3;
- if (Sprite[idx].field1C != PTRNUL)
+ if (Sprite[idx].field1C != g_PTRNUL)
_vm->_globals.dos_free2(Sprite[idx].field1C);
- Sprite[idx].field1C = PTRNUL;
+ Sprite[idx].field1C = g_PTRNUL;
}
void ObjectsManager::SPRITE_GEL(int idx) {
@@ -1794,7 +1794,7 @@ void ObjectsManager::VERIFZONE() {
v3 = _vm->_globals.compteur_71 + 1;
_vm->_globals.compteur_71 = v3;
if (v3 > 1u) {
- if (_vm->_globals.NOMARCHE || (_vm->_globals.chemin == PTRNUL) || v3 > 4u) {
+ if (_vm->_globals.NOMARCHE || (_vm->_globals.chemin == g_PTRNUL) || v3 > 4u) {
_vm->_globals.compteur_71 = 0;
if (_vm->_globals.old_x_69 != v0 || _vm->_globals.old_y_70 != v2) {
v4 = MZONE();
@@ -1916,7 +1916,7 @@ void ObjectsManager::CARRE_ZONE() {
for (int idx = 0; idx < 400; ++idx) {
v3 = _vm->_linesManager.LigneZone[idx].field4;
- if (v3 != PTRNUL) {
+ if (v3 != g_PTRNUL) {
v4 = _vm->_linesManager.LigneZone[idx].field2;
_vm->_globals.CarreZone[v4].field0 = 1;
if (_vm->_globals.CarreZone[v4].fieldC < idx)
@@ -1979,7 +1979,7 @@ void ObjectsManager::PLAN_BETA() {
_vm->_globals.PLAN_FLAG = 1;
_vm->_graphicsManager.NOFADE = false;
_vm->_globals.NOMARCHE = 0;
- sprite_ptr = PTRNUL;
+ sprite_ptr = g_PTRNUL;
_vm->_globals.SORTIE = 0;
_vm->_globals.AFFLI = 0;
_vm->_globals.AFFIVBL = 0;
@@ -2016,7 +2016,7 @@ void ObjectsManager::PLAN_BETA() {
_vm->_graphicsManager.SCROLL_ECRAN(v3 - 320);
_vm->_graphicsManager.ofscroll = XSPR(0) - 320;
SPRITE_ON(0);
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
_vm->_graphicsManager.SETCOLOR3(252, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(253, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(251, 100, 100, 100);
@@ -2060,7 +2060,7 @@ void ObjectsManager::PLAN_BETA() {
VERIFZONE();
GOHOME2();
- if (_vm->_globals.chemin == PTRNUL && _vm->_globals.GOACTION == 1)
+ if (_vm->_globals.chemin == g_PTRNUL && _vm->_globals.GOACTION == 1)
PARADISE();
_vm->_eventsManager.VBL();
@@ -2193,7 +2193,7 @@ LABEL_38:
}
GOACTION = 0;
v9 = _vm->_globals.chemin;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
if (_vm->_globals.FORET && ((uint16)(NUMZONE - 20) <= 1u || (uint16)(NUMZONE - 22) <= 1u)) {
if (YSPR(0) <= 374 || YSPR(0) > 410) {
v10 = XSPR(0);
@@ -2201,22 +2201,22 @@ LABEL_38:
v12 = XSPR(0);
v13 = _vm->_linesManager.PARCOURS2(v12, v11, v10, 390);
_vm->_globals.chemin = v13;
- if (PTRNUL != v13)
+ if (g_PTRNUL != v13)
PACOURS_PROPRE(v13);
g_old_x = XSPR(0);
g_old_y = YSPR(0);
_vm->_globals.Compteur = 0;
- if (PTRNUL != _vm->_globals.chemin || v9 == _vm->_globals.chemin) {
+ if (g_PTRNUL != _vm->_globals.chemin || v9 == _vm->_globals.chemin) {
LABEL_64:
_vm->_globals.g_old_sens = -1;
goto LABEL_65;
}
goto LABEL_63;
}
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
SETANISPR(0, _vm->_globals.g_old_sens2 + 59);
_vm->_globals.ACTION_SENS = 0;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
VERIFTAILLE();
SETFLIPSPR(0, 0);
_vm->_globals.Compteur = 0;
@@ -2229,12 +2229,12 @@ LABEL_64:
v15 = XSPR(0);
v16 = _vm->_linesManager.PARCOURS2(v15, v14, v19, v0);
_vm->_globals.chemin = v16;
- if (PTRNUL != v16)
+ if (g_PTRNUL != v16)
PACOURS_PROPRE(v16);
g_old_x = XSPR(0);
g_old_y = YSPR(0);
_vm->_globals.Compteur = 0;
- if (PTRNUL != _vm->_globals.chemin || v9 == _vm->_globals.chemin)
+ if (g_PTRNUL != _vm->_globals.chemin || v9 == _vm->_globals.chemin)
goto LABEL_64;
LABEL_63:
_vm->_globals.chemin = v9;
@@ -2265,7 +2265,7 @@ LABEL_65:
}
if (_vm->_globals.ECRAN == 20 && _vm->_globals.SAUVEGARDE->data[svField13] == 1 && _vm->_globals.OBJET_EN_COURS == 20 && NUMZONE == 12
&& _vm->_eventsManager.btsouris == 23) {
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
XSPR(0);
YSPR(0);
}
@@ -2411,17 +2411,17 @@ void ObjectsManager::CLEAR_ECRAN() {
NUMZONE = 0;
Vold_taille = 0;
SPEED_FLAG = 0;
- SPEED_PTR = PTRNUL;
+ SPEED_PTR = g_PTRNUL;
SPEED_X = 0;
SPEED_Y = 0;
SPEED_IMAGE = 0;
FORCEZONE = 1;
_vm->_linesManager.TOTAL_LIGNES = 0;
DERLIGNE = 0;
- _vm->_globals.chemin = PTRNUL;
- if (_vm->_globals.COUCOU != PTRNUL)
+ _vm->_globals.chemin = g_PTRNUL;
+ if (_vm->_globals.COUCOU != g_PTRNUL)
_vm->_globals.COUCOU = _vm->_fileManager.LIBERE_FICHIER(_vm->_globals.COUCOU);
- if (PTRNUL != _vm->_globals.SPRITE_ECRAN)
+ if (g_PTRNUL != _vm->_globals.SPRITE_ECRAN)
_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.LIBERE_FICHIER(_vm->_globals.SPRITE_ECRAN);
_vm->_eventsManager.start_x = 0;
_vm->_eventsManager.souris_n = 0;
@@ -2432,7 +2432,7 @@ void ObjectsManager::CLEAR_ECRAN() {
FORCEZONE = 1;
CHANGEVERBE = 0;
_vm->_globals.NOSPRECRAN = 0;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
g_old_sens = -1;
my_anim = 1;
A_ANIM = 0;
@@ -2493,7 +2493,7 @@ void ObjectsManager::INVENT() {
_vm->_eventsManager.VBL();
++v1;
} while (v1 <= 1);
- _vm->_globals.Winventaire = PTRNUL;
+ _vm->_globals.Winventaire = g_PTRNUL;
LABEL_7:
_vm->_eventsManager.souris_bb = 0;
_vm->_eventsManager.souris_b = 0;
@@ -2594,7 +2594,7 @@ LABEL_7:
_vm->_globals.SORTIE = 0;
if (v20 != 1) {
inventaire2 = _vm->_globals.dos_free2(inventaire2);
- if (PTRNUL != _vm->_globals.Winventaire)
+ if (g_PTRNUL != _vm->_globals.Winventaire)
_vm->_globals.Winventaire = _vm->_globals.dos_free2(_vm->_globals.Winventaire);
goto LABEL_7;
}
@@ -2619,7 +2619,7 @@ LABEL_7:
_vm->_graphicsManager.Ajoute_Segment_Vesa(v19, 114, v19 + v18, v18 + 114);
BOBTOUS = 1;
}
- if (PTRNUL != _vm->_globals.Winventaire)
+ if (g_PTRNUL != _vm->_globals.Winventaire)
_vm->_globals.Winventaire = _vm->_globals.dos_free2(_vm->_globals.Winventaire);
inventaire2 = _vm->_globals.dos_free2(inventaire2);
if (_vm->_eventsManager.btsouris == 1)
@@ -2653,7 +2653,7 @@ void ObjectsManager::CHANGE_TETE(int a1, int a2) {
_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, 532, 25, 65, 40, _vm->_graphicsManager.VESA_BUFFER, 532, 25);
_vm->_graphicsManager.Ajoute_Segment_Vesa(532, 25, 597, 65);
_vm->_globals.NOT_VERIF = 1;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
if (a1 == 2) {
if (!a2) {
if (_vm->_globals.SAUVEGARDE->data[svField188] == _vm->_globals.ECRAN) {
@@ -3246,7 +3246,7 @@ LABEL_88:
_vm->_globals.super_parcours[v61 + 3] = -1;
result = (byte *)&_vm->_globals.super_parcours[0];
} else {
- result = PTRNUL;
+ result = g_PTRNUL;
}
return result;
}
@@ -3760,12 +3760,12 @@ void ObjectsManager::OPTI_OBJET() {
file = "OBJET1.ini";
data = _vm->_fileManager.RECHERCHE_CAT(file, 1);
- if (data == PTRNUL) {
+ if (data == g_PTRNUL) {
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, file);
data = _vm->_fileManager.CHARGE_FICHIER(_vm->_globals.NFICHIER);
}
- if ((data == PTRNUL) || *data != 'I' || *(data + 1) != 'N' || *(data + 2) != 'I') {
+ if ((data == g_PTRNUL) || *data != 'I' || *(data + 1) != 'N' || *(data + 2) != 'I') {
error("Not an INI file");
} else {
v7 = 0;
@@ -4754,7 +4754,7 @@ LABEL_1141:
}
if (v76 == 46) {
_vm->_globals.NOT_VERIF = 1;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
v13 = YSPR(0);
v14 = XSPR(0);
_vm->_globals.chemin = _vm->_linesManager.PARCOURS2(v14, v13, 564, 420);
@@ -4762,7 +4762,7 @@ LABEL_1141:
do {
GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_globals.chemin != PTRNUL);
+ } while (_vm->_globals.chemin != g_PTRNUL);
SPRITE_OFF(0);
_vm->_globals.NOT_VERIF = 1;
_vm->_soundManager.CHARGE_SAMPLE(1, "SOUND44.WAV");
@@ -4825,7 +4825,7 @@ LABEL_1141:
g_old_x = XSPR(0);
g_old_sens = -1;
_vm->_globals.Compteur = 0;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
v16 = YSPR(0);
v17 = XSPR(0);
_vm->_globals.chemin = _vm->_linesManager.PARCOURS2(v17, v16, 445, 332);
@@ -4833,7 +4833,7 @@ LABEL_1141:
do {
GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_globals.chemin != PTRNUL);
+ } while (_vm->_globals.chemin != g_PTRNUL);
SPRITE_OFF(0);
BOBANIM_ON(7);
SET_BOBPOSI(7, 0);
@@ -4945,7 +4945,7 @@ LABEL_1141:
g_old_x = XSPR(0);
g_old_sens = -1;
_vm->_globals.Compteur = 0;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
v22 = YSPR(0);
v23 = XSPR(0);
_vm->_globals.chemin = _vm->_linesManager.PARCOURS2(v23, v22, 119, 268);
@@ -4953,7 +4953,7 @@ LABEL_1141:
do {
GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_globals.chemin != PTRNUL);
+ } while (_vm->_globals.chemin != g_PTRNUL);
SPRITE_OFF(0);
BOBANIM_ON(11);
BOBANIM_ON(8);
@@ -5167,7 +5167,7 @@ LABEL_1141:
g_old_x = XSPR(0);
g_old_sens = -1;
_vm->_globals.Compteur = 0;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
if (_vm->_globals.SAUVEGARDE->data[svField253] == 1) {
v27 = YSPR(0);
v28 = XSPR(0);
@@ -5187,7 +5187,7 @@ LABEL_1141:
do {
GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_globals.chemin != PTRNUL);
+ } while (_vm->_globals.chemin != g_PTRNUL);
SPRITE_OFF(0);
SETANISPR(0, 60);
_vm->_soundManager.CHARGE_SAMPLE(1, "SOUND63.WAV");
@@ -5375,7 +5375,7 @@ LABEL_1141:
_vm->_soundManager.SPECIAL_SOUND = 0;
}
_vm->_globals.NOT_VERIF = 1;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
v37 = YSPR(0);
v38 = XSPR(0);
_vm->_globals.chemin = _vm->_linesManager.PARCOURS2(v38, v37, 330, 418);
@@ -5384,7 +5384,7 @@ LABEL_1141:
do {
GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_globals.chemin != PTRNUL);
+ } while (_vm->_globals.chemin != g_PTRNUL);
SETANISPR(0, 64);
_vm->_globals.SORTIE = _vm->_globals.SAUVEGARDE->data[svField401];
_vm->_globals.DESACTIVE_INVENT = 0;
@@ -5400,7 +5400,7 @@ LABEL_1141:
while (BOBPOSI(1) != 9);
BOBANIM_OFF(1);
_vm->_globals.NO_VISU = 1;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
_vm->_globals.NOT_VERIF = 1;
v39 = YSPR(0);
v40 = XSPR(0);
@@ -5410,7 +5410,7 @@ LABEL_1141:
do {
GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_globals.chemin != PTRNUL);
+ } while (_vm->_globals.chemin != g_PTRNUL);
SETANISPR(0, 64);
BOBANIM_ON(2);
_vm->_soundManager.PLAY_SOUND("SOUND66.WAV");
@@ -5524,7 +5524,7 @@ LABEL_1141:
g_old_x = XSPR(0);
g_old_sens = -1;
_vm->_globals.Compteur = 0;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
_vm->_globals.NOT_VERIF = 1;
v43 = YSPR(0);
v44 = XSPR(0);
@@ -5533,7 +5533,7 @@ LABEL_1141:
do {
GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_globals.chemin != PTRNUL);
+ } while (_vm->_globals.chemin != g_PTRNUL);
SPRITE_OFF(0);
v45 = 0;
BOBANIM_ON(7);
@@ -6011,7 +6011,7 @@ LABEL_1141:
g_old_x = XSPR(0);
g_old_sens = -1;
_vm->_globals.Compteur = 0;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
_vm->_globals.NOT_VERIF = 1;
v55 = YSPR(0);
v56 = XSPR(0);
@@ -6021,7 +6021,7 @@ LABEL_1141:
do {
GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_globals.chemin != PTRNUL);
+ } while (_vm->_globals.chemin != g_PTRNUL);
_vm->_globals.SORTIE = 59;
}
if (v76 == 173) {
@@ -6032,7 +6032,7 @@ LABEL_1141:
g_old_x = XSPR(0);
g_old_sens = -1;
_vm->_globals.Compteur = 0;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
_vm->_globals.NOT_VERIF = 1;
v57 = YSPR(0);
v58 = XSPR(0);
@@ -6042,7 +6042,7 @@ LABEL_1141:
do {
GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_globals.chemin != PTRNUL);
+ } while (_vm->_globals.chemin != g_PTRNUL);
_vm->_globals.SORTIE = 59;
}
if (v76 == 174)
@@ -6152,7 +6152,7 @@ void ObjectsManager::VBOB(byte *a1, int idx, int a3, int a4, int a5) {
_vm->_globals.VBob[idx].field18 = a5;
_vm->_globals.VBob[idx].field0 = a1;
_vm->_globals.VBob[idx].field1C = a1;
- if (_vm->_globals.VBob[idx].field10 != PTRNUL)
+ if (_vm->_globals.VBob[idx].field10 != g_PTRNUL)
_vm->_globals.VBob[idx].field10 = _vm->_globals.dos_free2(_vm->_globals.VBob[idx].field10);
}
@@ -6182,7 +6182,7 @@ void ObjectsManager::VBOB_OFF(int idx) {
void ObjectsManager::ACTION_DOS(int idx) {
if (_vm->_globals.GESTE_FLAG != 1) {
- if (PTRNUL != _vm->_globals.GESTE)
+ if (g_PTRNUL != _vm->_globals.GESTE)
_vm->_globals.GESTE = _vm->_globals.dos_free2(_vm->_globals.GESTE);
_vm->_globals.GESTE_FLAG = 1;
@@ -6219,7 +6219,7 @@ void ObjectsManager::ACTION_DOS(int idx) {
void ObjectsManager::ACTION_DROITE(int idx) {
if (_vm->_globals.GESTE_FLAG != 3) {
- if (_vm->_globals.GESTE != PTRNUL)
+ if (_vm->_globals.GESTE != g_PTRNUL)
_vm->_globals.GESTE = _vm->_globals.dos_free2(_vm->_globals.GESTE);
_vm->_globals.GESTE_FLAG = 3;
_vm->_fileManager.CONSTRUIT_SYSTEM("PROFIL.SPR");
@@ -6249,7 +6249,7 @@ void ObjectsManager::ACTION_DROITE(int idx) {
void ObjectsManager::Q_DROITE(int idx) {
if (_vm->_globals.GESTE_FLAG != 4) {
- if (_vm->_globals.GESTE != PTRNUL)
+ if (_vm->_globals.GESTE != g_PTRNUL)
_vm->_globals.GESTE = _vm->_globals.dos_free2(_vm->_globals.GESTE);
_vm->_globals.GESTE_FLAG = 4;
_vm->_fileManager.CONSTRUIT_SYSTEM("3Q.SPR");
@@ -6279,7 +6279,7 @@ void ObjectsManager::Q_DROITE(int idx) {
void ObjectsManager::ACTION_FACE(int idx) {
if (_vm->_globals.GESTE_FLAG != 2) {
- if (_vm->_globals.GESTE != PTRNUL)
+ if (_vm->_globals.GESTE != g_PTRNUL)
_vm->_globals.GESTE = _vm->_globals.dos_free2(_vm->_globals.GESTE);
_vm->_globals.GESTE_FLAG = 2;
_vm->_fileManager.CONSTRUIT_SYSTEM("FACE.SPR");
@@ -6297,7 +6297,7 @@ void ObjectsManager::ACTION_FACE(int idx) {
void ObjectsManager::Q_GAUCHE(int idx) {
if (_vm->_globals.GESTE_FLAG != 4) {
- if (_vm->_globals.GESTE != PTRNUL)
+ if (_vm->_globals.GESTE != g_PTRNUL)
_vm->_globals.GESTE = _vm->_globals.dos_free2(_vm->_globals.GESTE);
_vm->_globals.GESTE_FLAG = 4;
_vm->_fileManager.CONSTRUIT_SYSTEM("3Q.SPR");
@@ -6327,7 +6327,7 @@ void ObjectsManager::Q_GAUCHE(int idx) {
void ObjectsManager::ACTION_GAUCHE(int idx) {
if (_vm->_globals.GESTE_FLAG != 3) {
- if (_vm->_globals.GESTE != PTRNUL)
+ if (_vm->_globals.GESTE != g_PTRNUL)
_vm->_globals.GESTE = _vm->_globals.dos_free2(_vm->_globals.GESTE);
_vm->_globals.GESTE_FLAG = 3;
_vm->_fileManager.CONSTRUIT_SYSTEM("PROFIL.SPR");
@@ -6487,7 +6487,7 @@ void ObjectsManager::INILINK(const Common::String &file) {
filename = file + ".LNK";
ptr = _vm->_fileManager.RECHERCHE_CAT(filename, 3);
nbytes = _vm->_globals.CAT_TAILLE;
- if (ptr == PTRNUL) {
+ if (ptr == g_PTRNUL) {
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, filename);
if (!f.open(_vm->_globals.NFICHIER))
@@ -6495,7 +6495,7 @@ void ObjectsManager::INILINK(const Common::String &file) {
nbytes = f.size();
ptr = _vm->_globals.dos_malloc2(nbytes);
- if (PTRNUL == ptr)
+ if (g_PTRNUL == ptr)
error("INILINK");
_vm->_fileManager.bload_it(f, ptr, nbytes);
f.close();
@@ -6510,7 +6510,7 @@ void ObjectsManager::INILINK(const Common::String &file) {
if (!filename2.empty()) {
_vm->_globals.CACHE_BANQUE[1] = _vm->_fileManager.RECHERCHE_CAT(filename2, 8);
- if (_vm->_globals.CACHE_BANQUE[1] || _vm->_globals.CACHE_BANQUE[1] == PTRNUL) {
+ if (_vm->_globals.CACHE_BANQUE[1] || _vm->_globals.CACHE_BANQUE[1] == g_PTRNUL) {
_vm->_globals.CAT_FLAG = 0;
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, filename2);
} else {
@@ -7179,7 +7179,7 @@ int ObjectsManager::colision(int a1, int a2) {
do {
byte *srcP = _vm->_linesManager.LigneZone[v8].field4;
- if (srcP != PTRNUL) {
+ if (srcP != g_PTRNUL) {
bool flag = true;
int v11 = READ_LE_UINT16(srcP + _vm->_linesManager.LigneZone[v8].field0 * 2);
int dataV2 = READ_LE_UINT16(srcP + _vm->_linesManager.LigneZone[v8].field0 * 2 + 2);
@@ -7535,7 +7535,7 @@ void ObjectsManager::PERSONAGE(const Common::String &s1, const Common::String &s
_vm->_globals.PLAN_FLAG = 0;
_vm->_globals.iRegul = 1;
_vm->_soundManager.WSOUND(v);
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
_vm->_globals.NOMARCHE = 1;
_vm->_globals.SORTIE = 0;
_vm->_globals.AFFLI = 0;
@@ -7557,7 +7557,7 @@ void ObjectsManager::PERSONAGE(const Common::String &s1, const Common::String &s
if (_vm->_globals.ECRAN == 61) {
SPRITE(_vm->_globals.PERSO, 330, 418, 0, 60, 0, 0, 34, 190);
SPRITE_ON(0);
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
VERIFTAILLE();
}
_vm->_graphicsManager.SETCOLOR3(252, 100, 100, 100);
@@ -7580,7 +7580,7 @@ void ObjectsManager::PERSONAGE(const Common::String &s1, const Common::String &s
g_old_x = XSPR(0);
g_old_sens = -1;
_vm->_globals.Compteur = 0;
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
v7 = YSPR(0);
v8 = XSPR(0);
_vm->_globals.chemin = _vm->_linesManager.PARCOURS2(v8, v7, 330, 345);
@@ -7588,7 +7588,7 @@ void ObjectsManager::PERSONAGE(const Common::String &s1, const Common::String &s
do {
GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_globals.chemin != PTRNUL);
+ } while (_vm->_globals.chemin != g_PTRNUL);
SETANISPR(0, 64);
}
do {
@@ -7702,7 +7702,7 @@ LABEL_70:
_vm->_objectsManager.VERIFTAILLE();
SPRITE_ON(0);
_vm->_globals.CACHE_ON();
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
_vm->_objectsManager.VERIFTAILLE();
SPECIAL_INI(s2);
_vm->_eventsManager.souris_n = 4;
@@ -7734,7 +7734,7 @@ LABEL_70:
v10 = yp;
if (v12 == xp) {
if (v11 == yp) {
- _vm->_globals.chemin = PTRNUL;
+ _vm->_globals.chemin = g_PTRNUL;
_vm->_objectsManager.PARADISE();
if (_vm->_globals.SORTIE)
v13 = 1;
@@ -7751,7 +7751,7 @@ LABEL_70:
if (!_vm->_globals.SORTIE) {
TEST_INVENT();
_vm->_objectsManager.VERIFZONE();
- if (_vm->_globals.chemin == PTRNUL || (_vm->_objectsManager.GOHOME(), _vm->_globals.chemin == PTRNUL)) {
+ if (_vm->_globals.chemin == g_PTRNUL || (_vm->_objectsManager.GOHOME(), _vm->_globals.chemin == g_PTRNUL)) {
if (_vm->_objectsManager.GOACTION == 1)
_vm->_objectsManager.PARADISE();
}
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index f792f4d898..589183157a 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -62,7 +62,7 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
_vm->_globals.DESACTIVE_INVENT = 1;
BUFFERPERSO = _vm->_fileManager.RECHERCHE_CAT(filename, 5);
TAILLEPERSO = _vm->_globals.CAT_TAILLE;
- if (BUFFERPERSO == PTRNUL) {
+ if (BUFFERPERSO == g_PTRNUL) {
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, filename);
BUFFERPERSO = _vm->_fileManager.CHARGE_FICHIER(_vm->_globals.NFICHIER);
TAILLEPERSO = _vm->_fileManager.FLONG(_vm->_globals.NFICHIER);
@@ -193,7 +193,7 @@ void TalkManager::PARLER_PERSO2(const Common::String &filename) {
_vm->_objectsManager.DESACTIVE_INVENT = 1;
BUFFERPERSO = _vm->_fileManager.RECHERCHE_CAT(filename, 5);
TAILLEPERSO = _vm->_globals.CAT_TAILLE;
- if (BUFFERPERSO == PTRNUL) {
+ if (BUFFERPERSO == g_PTRNUL) {
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, filename);
BUFFERPERSO = _vm->_fileManager.CHARGE_FICHIER(_vm->_globals.NFICHIER);
TAILLEPERSO = _vm->_fileManager.FLONG(_vm->_globals.NFICHIER);
@@ -638,7 +638,7 @@ int TalkManager::VERIF_BOITE(int idx, const Common::String &file, int a3) {
f.seek(READ_LE_UINT32(&indexData[idx * 4]));
ptr = _vm->_globals.dos_malloc2(2058);
- if (ptr == PTRNUL)
+ if (ptr == g_PTRNUL)
error("temporary TEXT");
f.read(ptr, 2048);
f.close();
@@ -831,10 +831,10 @@ void TalkManager::ANIM_PERSO_INIT() {
void TalkManager::CLEAR_ANIM_PERSO() {
for (int idx = 21; idx <= 34; ++idx) {
- if (_vm->_globals.Bqe_Anim[idx].data != PTRNUL)
+ if (_vm->_globals.Bqe_Anim[idx].data != g_PTRNUL)
_vm->_globals.Bqe_Anim[idx].data = _vm->_globals.dos_free2(_vm->_globals.Bqe_Anim[idx].data);
- _vm->_globals.Bqe_Anim[idx].data = PTRNUL;
+ _vm->_globals.Bqe_Anim[idx].data = g_PTRNUL;
_vm->_globals.Bqe_Anim[idx].field4 = 0;
}
}
@@ -879,8 +879,8 @@ bool TalkManager::RECHERCHE_ANIM_PERSO(int a1, const byte *bufPerso, int a3, int
v7 = 1;
if (v18 > a4) {
_vm->_globals.Bqe_Anim[a1].field4 = 0;
- result = PTRNUL;
- _vm->_globals.Bqe_Anim[v20].data = PTRNUL;
+ result = g_PTRNUL;
+ _vm->_globals.Bqe_Anim[v20].data = g_PTRNUL;
}
++v18;
++v6;
@@ -955,7 +955,7 @@ void TalkManager::REPONSE(int a1, int a2) {
v3 = a2;
LABEL_2:
v15 = 0;
- if (PTRNUL != _vm->_globals.COUCOU) {
+ if (g_PTRNUL != _vm->_globals.COUCOU) {
v5 = _vm->_globals.COUCOU;
while (1) {
if (*v5 == 'C') {
@@ -975,7 +975,7 @@ LABEL_2:
if (v15 == 1) {
v6 = v5 + 5;
ptr = _vm->_globals.dos_malloc2(0x26Cu);
- if (PTRNUL == ptr)
+ if (g_PTRNUL == ptr)
error("TRADUC");
memset(ptr, 0, 0x26Bu);
v7 = 0;
@@ -1183,7 +1183,7 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
_vm->_eventsManager.CHANGE_MOUSE(0);
BUFFERPERSO = _vm->_fileManager.RECHERCHE_CAT(a2, 5);
TAILLEPERSO = _vm->_globals.CAT_TAILLE;
- if (BUFFERPERSO == PTRNUL) {
+ if (BUFFERPERSO == g_PTRNUL) {
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, a2);
BUFFERPERSO = _vm->_fileManager.CHARGE_FICHIER(_vm->_globals.NFICHIER);
TAILLEPERSO = _vm->_fileManager.FLONG(_vm->_globals.NFICHIER);
@@ -1224,7 +1224,7 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
CHERCHE_PAL(v10, 1);
CHERCHE_ANIM0(v10, 0);
v11 = _vm->_globals.COUCOU;
- _vm->_globals.COUCOU = PTRNUL;
+ _vm->_globals.COUCOU = g_PTRNUL;
_vm->_globals.NOMARCHE = 1;
_vm->_objectsManager.INILINK(v22);
_vm->_objectsManager.PERSO_ON = 1;
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-23 18:51:34 +0000