aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/hopkins/globals.h6
-rw-r--r--engines/hopkins/objects.cpp24
-rw-r--r--engines/hopkins/saveload.cpp6
-rw-r--r--engines/hopkins/script.cpp4
4 files changed, 20 insertions, 20 deletions
diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index bc87144eb3..366b13ddfc 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -279,9 +279,9 @@ enum PlayerCharacter { CHARACTER_HOPKINS = 0, CHARACTER_HOPKINS_CLONE = 1, CHARA
// TODO: Sauvegrade1 fields should really be mapped into data array
struct Sauvegarde {
byte data[0x802];
- CharacterLocation field360;
- CharacterLocation field370;
- CharacterLocation field380;
+ CharacterLocation cloneHopkins;
+ CharacterLocation realHopkins;
+ CharacterLocation samantha;
int16 inventory[35]; // Originally at offset 1300 of data array
};
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index e87965ca65..43c7d163c0 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -3077,9 +3077,9 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter oldCharacter, PlayerCharacter n
_vm->_globals.NOT_VERIF = 1;
_vm->_globals.chemin = (int16 *)g_PTRNUL;
- if (oldCharacter == CHARACTER_SAMANTHA && !newCharacter && _vm->_globals.SAUVEGARDE->field370.location) {
+ if (oldCharacter == CHARACTER_SAMANTHA && !newCharacter && _vm->_globals.SAUVEGARDE->realHopkins.location) {
CH_TETE = 0;
- loc = &_vm->_globals.SAUVEGARDE->field380;
+ loc = &_vm->_globals.SAUVEGARDE->samantha;
loc->xp = XSPR(0);
loc->yp = YSPR(0);
loc->field2 = 64;
@@ -3096,16 +3096,16 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter oldCharacter, PlayerCharacter n
_vm->_globals.SAUVEGARDE->data[svField357] = 1;
T_RECTIF = 0;
- loc = &_vm->_globals.SAUVEGARDE->field370;
+ loc = &_vm->_globals.SAUVEGARDE->realHopkins;
_vm->_fileManager.CONSTRUIT_SYSTEM("PERSO.SPR");
_vm->_fileManager.CHARGE_FICHIER2(_vm->_globals.NFICHIER, _vm->_globals.PERSO);
_vm->_globals.PERSO_TYPE = 0;
SPRITE(_vm->_globals.PERSO, loc->xp, loc->yp, 0, 64, loc->field4, 0, 34, 190);
SPRITE_ON(0);
_vm->_globals.HOPKINS_DATA();
- } else if (!oldCharacter && newCharacter == CHARACTER_SAMANTHA && _vm->_globals.SAUVEGARDE->field380.location == _vm->_globals.ECRAN) {
+ } else if (!oldCharacter && newCharacter == CHARACTER_SAMANTHA && _vm->_globals.SAUVEGARDE->samantha.location == _vm->_globals.ECRAN) {
CH_TETE = 0;
- loc = &_vm->_globals.SAUVEGARDE->field370;
+ loc = &_vm->_globals.SAUVEGARDE->realHopkins;
loc->xp = XSPR(0);
loc->yp = YSPR(0);
loc->field2 = 64;
@@ -3119,7 +3119,7 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter oldCharacter, PlayerCharacter n
_vm->_globals.SAUVEGARDE->data[svField356] = 1;
_vm->_globals.SAUVEGARDE->data[svField357] = 0;
- loc = &_vm->_globals.SAUVEGARDE->field380;
+ loc = &_vm->_globals.SAUVEGARDE->samantha;
_vm->_fileManager.CONSTRUIT_SYSTEM("PSAMAN.SPR");
_vm->_fileManager.CHARGE_FICHIER2(_vm->_globals.NFICHIER, _vm->_globals.PERSO);
_vm->_globals.PERSO_TYPE = 2;
@@ -3129,7 +3129,7 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter oldCharacter, PlayerCharacter n
} else {
switch (oldCharacter) {
case CHARACTER_HOPKINS:
- loc = &_vm->_globals.SAUVEGARDE->field370;
+ loc = &_vm->_globals.SAUVEGARDE->realHopkins;
loc->xp = XSPR(0);
loc->yp = YSPR(0);
loc->field2 = 64;
@@ -3137,7 +3137,7 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter oldCharacter, PlayerCharacter n
loc->field4 = Sprite[0].fieldC;
break;
case CHARACTER_HOPKINS_CLONE:
- loc = &_vm->_globals.SAUVEGARDE->field360;
+ loc = &_vm->_globals.SAUVEGARDE->cloneHopkins;
loc->xp = XSPR(0);
loc->yp = YSPR(0);
loc->field2 = 64;
@@ -3145,7 +3145,7 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter oldCharacter, PlayerCharacter n
loc->field4 = Sprite[0].fieldC;
break;
case CHARACTER_SAMANTHA:
- loc = &_vm->_globals.SAUVEGARDE->field380;
+ loc = &_vm->_globals.SAUVEGARDE->samantha;
loc->xp = XSPR(0);
loc->yp = YSPR(0);
loc->field2 = 64;
@@ -3162,21 +3162,21 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter oldCharacter, PlayerCharacter n
_vm->_globals.SAUVEGARDE->data[svField354] = 0;
_vm->_globals.SAUVEGARDE->data[svField356] = 0;
_vm->_globals.SAUVEGARDE->data[svField357] = 1;
- _vm->_globals.SORTIE = _vm->_globals.SAUVEGARDE->field370.location;
+ _vm->_globals.SORTIE = _vm->_globals.SAUVEGARDE->realHopkins.location;
break;
case CHARACTER_HOPKINS_CLONE:
_vm->_globals.SAUVEGARDE->data[svField121] = 1;
_vm->_globals.SAUVEGARDE->data[svField354] = 1;
_vm->_globals.SAUVEGARDE->data[svField356] = 0;
_vm->_globals.SAUVEGARDE->data[svField357] = 0;
- _vm->_globals.SORTIE = _vm->_globals.SAUVEGARDE->field360.location;
+ _vm->_globals.SORTIE = _vm->_globals.SAUVEGARDE->cloneHopkins.location;
break;
case CHARACTER_SAMANTHA:
_vm->_globals.SAUVEGARDE->data[svField121] = 0;
_vm->_globals.SAUVEGARDE->data[svField354] = 0;
_vm->_globals.SAUVEGARDE->data[svField356] = 1;
_vm->_globals.SAUVEGARDE->data[svField357] = 0;
- _vm->_globals.SORTIE = _vm->_globals.SAUVEGARDE->field380.location;
+ _vm->_globals.SORTIE = _vm->_globals.SAUVEGARDE->samantha.location;
break;
}
}
diff --git a/engines/hopkins/saveload.cpp b/engines/hopkins/saveload.cpp
index 958737d773..47fc140290 100644
--- a/engines/hopkins/saveload.cpp
+++ b/engines/hopkins/saveload.cpp
@@ -235,9 +235,9 @@ void SaveLoadManager::createThumbnail(Graphics::Surface *s) {
void SaveLoadManager::syncSavegameData(Common::Serializer &s) {
s.syncBytes(&_vm->_globals.SAUVEGARDE->data[0], 0x802);
- syncCharacterLocation(s, _vm->_globals.SAUVEGARDE->field360);
- syncCharacterLocation(s, _vm->_globals.SAUVEGARDE->field370);
- syncCharacterLocation(s, _vm->_globals.SAUVEGARDE->field380);
+ syncCharacterLocation(s, _vm->_globals.SAUVEGARDE->cloneHopkins);
+ syncCharacterLocation(s, _vm->_globals.SAUVEGARDE->realHopkins);
+ syncCharacterLocation(s, _vm->_globals.SAUVEGARDE->samantha);
for (int i = 0; i < 35; ++i)
s.syncAsSint16LE(_vm->_globals.SAUVEGARDE->inventory[i]);
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index 948e2b2112..a0b17c13ed 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -1936,7 +1936,7 @@ LABEL_1141:
_vm->_eventsManager.VBL();
}
- v51 = &_vm->_globals.SAUVEGARDE->field370;
+ v51 = &_vm->_globals.SAUVEGARDE->realHopkins;
v51->xp = _vm->_objectsManager.XSPR(0);
v51->yp = _vm->_objectsManager.YSPR(0);
v51->field2 = 57;
@@ -2164,7 +2164,7 @@ LABEL_1141:
_vm->_animationManager.NO_SEQ = true;
_vm->_animationManager.PLAY_SEQ("RESUF.SEQ", 1, 24, 1);
_vm->_animationManager.NO_SEQ = false;
- v53 = &_vm->_globals.SAUVEGARDE->field380;
+ v53 = &_vm->_globals.SAUVEGARDE->samantha;
v53->xp = 404;
v53->yp = 395;
v53->field2 = 64;
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 14:21:40 +0000