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

TRECISION: Fix regression with closeup exits

Browse Source
This commit is contained in:
Filippos Karapetis 2021-05-30 14:14:07 +03:00
parent de70a494cb
commit bd64803269
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/trecision/defines.h
View File

@ -669,7 +669,7 @@ enum RoomId {
#define oSCRIVANIA2B 419
#define oPORTALAMPADE2B 420
#define omLAMPADINA2B 421
#define oEXIT2BL 422
#define oEXIT2BL 422 // Exit from Egyptology book
#define oUEPOIS 423
#define oHATOR 424
#define oNUT 425
@ -973,7 +973,7 @@ enum RoomId {
#define oSCATOLONE36 723
#define omCARTACCE36 724
#define omSCATOLONEA36 725
#define oEXIT36F 726
#define oEXIT36F 726 // Exit from security system sequence
#define oSIMON37 727
#define oSPORTELLOA37 728
#define oSPORTELLOI37 729
@ -1436,7 +1436,7 @@ enum RoomId {
#define omWINDOW5A 1200
#define oPIANTE5A 1201
#define oEXIT58T 1202
#define oEXIT41D 1203
#define oEXIT41D 1203 // Exit from positioner
#define oPULSANTECD 1205
#define oPULSANTE1AD 1247
#define oPULSANTE33AD 1279

8
engines/trecision/logic.cpp
View File

@ -3505,16 +3505,16 @@ bool LogicManager::operateInventory() {
break;
case kItemEgyptologyBook:
_vm->changeRoom(kRoom2BL);
_vm->_obj[oEXIT2BL]._goRoom = _vm->_curRoom;
_vm->changeRoom(kRoom2BL);
_vm->_actor->actorStop();
_vm->_pathFind->nextStep();
printSentence = false;
break;
case kItemSecuritySystemSequence:
_vm->changeRoom(kRoom36F);
_vm->_obj[oEXIT36F]._goRoom = _vm->_curRoom;
_vm->changeRoom(kRoom36F);
_vm->_actor->actorStop();
_vm->_pathFind->nextStep();
printSentence = false;
@ -3523,8 +3523,8 @@ bool LogicManager::operateInventory() {
case kItemPositioner:
for (int a = oROOM41; a <= oROOM45B; ++a)
_vm->setObjectVisible(a, false);
_vm->changeRoom(kRoom41D);
_vm->_obj[oEXIT41D]._goRoom = _vm->_curRoom;
_vm->changeRoom(kRoom41D);
_vm->_inventoryObj[kItemPositioner].setFlagExtra(false);
_vm->_actor->actorStop();
_vm->_pathFind->nextStep();
@ -3845,8 +3845,8 @@ void LogicManager::doSystemChangeRoom(uint16 room) {
_vm->_curRoom = room;
_vm->_scheduler->resetQueues();
_vm->closeInventoryImmediately();
_vm->clearUseWith();
_vm->closeInventoryImmediately();
_vm->_flagCharacterExists = true;
_vm->_flagShowCharacter = true;