libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-04 16:38:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HOPKINS: Changed final PlayerCharacter constant to CHARACTER_SAMANTHA

Browse Source
This commit is contained in:
Paul Gilbert 2012-11-24 22:31:12 +11:00
parent d52ae2f47b
commit b695d9c709
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/hopkins/globals.h
View File

@ -274,7 +274,7 @@ enum SauvegardeOffset {
, svField401 = 401 , svField401 = 401
}; };
enum PlayerCharacter { CHARACTER_HOPKINS = 0, CHARACTER_HOPKINS_CLONE = 1, CHARACTER_2 = 2 }; enum PlayerCharacter { CHARACTER_HOPKINS = 0, CHARACTER_HOPKINS_CLONE = 1, CHARACTER_SAMANTHA = 2 };
// TODO: Sauvegrade1 fields should really be mapped into data array // TODO: Sauvegrade1 fields should really be mapped into data array
struct Sauvegarde { struct Sauvegarde {

12
engines/hopkins/objects.cpp
View File

@ -2750,7 +2750,7 @@ void ObjectsManager::BTGAUCHE() {
&& !_vm->_globals.PLAN_FLAG && !_vm->_globals.PLAN_FLAG
&& (uint16)(destX - 533) <= 0x1Au && (uint16)(destX - 533) <= 0x1Au
&& (uint16)(destY - 26) <= 0x21u) { && (uint16)(destY - 26) <= 0x21u) {
CHANGE_TETE(CHARACTER_2, CHARACTER_HOPKINS); CHANGE_TETE(CHARACTER_SAMANTHA, CHARACTER_HOPKINS);
return; return;
} }
if (_vm->_globals.SAUVEGARDE->data[svField357] == 1) { if (_vm->_globals.SAUVEGARDE->data[svField357] == 1) {
@ -2765,7 +2765,7 @@ void ObjectsManager::BTGAUCHE() {
&& !_vm->_globals.PLAN_FLAG && !_vm->_globals.PLAN_FLAG
&& (uint16)(destX - 567) <= 0x1Au && (uint16)(destX - 567) <= 0x1Au
&& (uint16)(destY - 26) <= 0x21u) { && (uint16)(destY - 26) <= 0x21u) {
CHANGE_TETE(CHARACTER_HOPKINS, CHARACTER_2); CHANGE_TETE(CHARACTER_HOPKINS, CHARACTER_SAMANTHA);
return; return;
} }
} }
@ -3077,7 +3077,7 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter a1, PlayerCharacter a2) {
_vm->_globals.NOT_VERIF = 1; _vm->_globals.NOT_VERIF = 1;
_vm->_globals.chemin = (int16 *)g_PTRNUL; _vm->_globals.chemin = (int16 *)g_PTRNUL;
if (a1 == CHARACTER_2 && !a2 && _vm->_globals.SAUVEGARDE->field370.location) { if (a1 == CHARACTER_SAMANTHA && !a2 && _vm->_globals.SAUVEGARDE->field370.location) {
CH_TETE = 0; CH_TETE = 0;
loc = &_vm->_globals.SAUVEGARDE->field380; loc = &_vm->_globals.SAUVEGARDE->field380;
loc->xp = XSPR(0); loc->xp = XSPR(0);
@ -3103,7 +3103,7 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter a1, PlayerCharacter a2) {
SPRITE(_vm->_globals.PERSO, loc->xp, loc->yp, 0, 64, loc->field4, 0, 34, 190); SPRITE(_vm->_globals.PERSO, loc->xp, loc->yp, 0, 64, loc->field4, 0, 34, 190);
SPRITE_ON(0); SPRITE_ON(0);
_vm->_globals.HOPKINS_DATA(); _vm->_globals.HOPKINS_DATA();
} else if (!a1 && a2 == CHARACTER_2 && _vm->_globals.SAUVEGARDE->field380.location == _vm->_globals.ECRAN) { } else if (!a1 && a2 == CHARACTER_SAMANTHA && _vm->_globals.SAUVEGARDE->field380.location == _vm->_globals.ECRAN) {
CH_TETE = 0; CH_TETE = 0;
loc = &_vm->_globals.SAUVEGARDE->field370; loc = &_vm->_globals.SAUVEGARDE->field370;
loc->xp = XSPR(0); loc->xp = XSPR(0);
@ -3144,7 +3144,7 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter a1, PlayerCharacter a2) {
loc->location = _vm->_globals.ECRAN; loc->location = _vm->_globals.ECRAN;
loc->field4 = Sprite[0].fieldC; loc->field4 = Sprite[0].fieldC;
break; break;
case CHARACTER_2: case CHARACTER_SAMANTHA:
loc = &_vm->_globals.SAUVEGARDE->field380; loc = &_vm->_globals.SAUVEGARDE->field380;
loc->xp = XSPR(0); loc->xp = XSPR(0);
loc->yp = YSPR(0); loc->yp = YSPR(0);
@ -3171,7 +3171,7 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter a1, PlayerCharacter a2) {
_vm->_globals.SAUVEGARDE->data[svField357] = 0; _vm->_globals.SAUVEGARDE->data[svField357] = 0;
_vm->_globals.SORTIE = _vm->_globals.SAUVEGARDE->field360.location; _vm->_globals.SORTIE = _vm->_globals.SAUVEGARDE->field360.location;
break; break;
case CHARACTER_2: case CHARACTER_SAMANTHA:
_vm->_globals.SAUVEGARDE->data[svField121] = 0; _vm->_globals.SAUVEGARDE->data[svField121] = 0;
_vm->_globals.SAUVEGARDE->data[svField354] = 0; _vm->_globals.SAUVEGARDE->data[svField354] = 0;
_vm->_globals.SAUVEGARDE->data[svField356] = 1; _vm->_globals.SAUVEGARDE->data[svField356] = 1;