libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 00:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XEEN: Fix whether events are checked after openGrate calls

Browse Source
This commit is contained in:
Paul Gilbert 2018-03-19 21:25:59 -04:00
parent 0a20df9259
commit 9504ecd74e
3 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/xeen/interface.cpp
View File

@ -285,28 +285,24 @@ void Interface::perform() {
switch (lookupId) {
case 1:
if (!map._isOutdoors) {
scripts.openGrate(13, 1);
eventsFlag = _buttonValue != 0;
eventsFlag = !scripts.openGrate(13, 1);
}
break;
case 6:
// Open grate being closed
if (!map._isOutdoors) {
scripts.openGrate(9, 0);
eventsFlag = _buttonValue != 0;
eventsFlag = !scripts.openGrate(9, 0);
}
break;
case 9:
// Closed grate being opened
if (!map._isOutdoors) {
scripts.openGrate(6, 0);
eventsFlag = _buttonValue != 0;
eventsFlag = !scripts.openGrate(6, 0);
}
break;
case 13:
if (!map._isOutdoors) {
scripts.openGrate(1, 1);
eventsFlag = _buttonValue != 0;
eventsFlag = !scripts.openGrate(1, 1);
}
break;
default:

98
engines/xeen/scripts.cpp
View File

@ -269,7 +269,7 @@ int Scripts::checkEvents() {
return _scriptResult;
}
void Scripts::openGrate(int wallVal, int action) {
bool Scripts::openGrate(int wallVal, int action) {
Combat &combat = *_vm->_combat;
FileManager &files = *_vm->_files;
Interface &intf = *_vm->_interface;
@ -278,60 +278,62 @@ void Scripts::openGrate(int wallVal, int action) {
Sound &sound = *_vm->_sound;
int ccNum = files._ccNum;
if ((wallVal != 13 || map._currentGrateUnlocked) && (!ccNum || wallVal != 9 ||
map.mazeData()._wallKind != 2)) {
if (wallVal != 9 && !map._currentGrateUnlocked) {
int charIndex = WhoWill::show(_vm, 13, action, false) - 1;
if (charIndex < 0) {
intf.draw3d(true);
return;
}
if (!((wallVal != 13 || map._currentGrateUnlocked) && (!ccNum || wallVal != 9 ||
map.mazeData()._wallKind != 2)))
return false;
// There is a 1 in 4 chance the character will receive damage
if (_vm->getRandomNumber(1, 4) == 1) {
combat.giveCharDamage(map.mazeData()._trapDamage,
(DamageType)_vm->getRandomNumber(0, 6), charIndex);
}
// Check whether character can unlock the door
Character &c = party._activeParty[charIndex];
if ((c.getThievery() + _vm->getRandomNumber(1, 20)) <
map.mazeData()._difficulties._unlockDoor)
return;
c._experience += map.mazeData()._difficulties._unlockDoor * c.getCurrentLevel();
if (wallVal != 9 && !map._currentGrateUnlocked) {
int charIndex = WhoWill::show(_vm, 13, action, false) - 1;
if (charIndex < 0) {
intf.draw3d(true);
return true;
}
// Flag the grate as unlocked, and the wall the grate is on
map.setCellSurfaceFlags(party._mazePosition, 0x80);
map.setWall(party._mazePosition, party._mazeDirection, wallVal);
// Set the grate as opened and the wall on the other side of the grate
Common::Point pt = party._mazePosition;
Direction dir = (Direction)((int)party._mazeDirection ^ 2);
switch (party._mazeDirection) {
case DIR_NORTH:
pt.y++;
break;
case DIR_EAST:
pt.x++;
break;
case DIR_SOUTH:
pt.y--;
break;
case DIR_WEST:
pt.x--;
break;
default:
break;
// There is a 1 in 4 chance the character will receive damage
if (_vm->getRandomNumber(1, 4) == 1) {
combat.giveCharDamage(map.mazeData()._trapDamage,
(DamageType)_vm->getRandomNumber(0, 6), charIndex);
}
map.setCellSurfaceFlags(pt, 0x80);
map.setWall(pt, dir, wallVal);
// Check whether character can unlock the door
Character &c = party._activeParty[charIndex];
if ((c.getThievery() + _vm->getRandomNumber(1, 20)) <
map.mazeData()._difficulties._unlockDoor)
return true;
sound.playFX(10);
intf.draw3d(true);
c._experience += map.mazeData()._difficulties._unlockDoor * c.getCurrentLevel();
}
// Flag the grate as unlocked, and the wall the grate is on
map.setCellSurfaceFlags(party._mazePosition, 0x80);
map.setWall(party._mazePosition, party._mazeDirection, wallVal);
// Set the grate as opened and the wall on the other side of the grate
Common::Point pt = party._mazePosition;
Direction dir = (Direction)((int)party._mazeDirection ^ 2);
switch (party._mazeDirection) {
case DIR_NORTH:
pt.y++;
break;
case DIR_EAST:
pt.x++;
break;
case DIR_SOUTH:
pt.y--;
break;
case DIR_WEST:
pt.x--;
break;
default:
break;
}
map.setCellSurfaceFlags(pt, 0x80);
map.setWall(pt, dir, wallVal);
sound.playFX(10);
intf.draw3d(true);
return true;
}
bool Scripts::doOpcode(MazeEvent &event) {

3
engines/xeen/scripts.h
View File

@ -563,8 +563,9 @@ public:
/**
* Handles opening grates
* @returns If true, no further event checking should be done
*/
void openGrate(int wallVal, int action);
bool openGrate(int wallVal, int action);
};
} // End of namespace Xeen