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

DM: Refactor f155_getStairsExitDirection

Browse Source
This commit is contained in:
Strangerke 2016-08-09 22:58:23 +02:00 committed by Bendegúz Nagy
parent 6885cf6e59
commit 69c5b01e12
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engines/dm/dungeonman.cpp
View File

@ -1568,19 +1568,22 @@ void DungeonMan::f164_unlinkThingFromList(Thing thingToUnlink, Thing thingInList
} }
int16 DungeonMan::f155_getStairsExitDirection(int16 mapX, int16 mapY) { int16 DungeonMan::f155_getStairsExitDirection(int16 mapX, int16 mapY) {
int16 L0256_i_SquareType; bool northSouthOrientedStairs = !getFlag(f151_getSquare(mapX, mapY).toByte(), k0x0008_StairsNorthSouthOrient);
bool L0257_B_NorthSouthOrientedStairs;
if (northSouthOrientedStairs) {
if (L0257_B_NorthSouthOrientedStairs = !getFlag(f151_getSquare(mapX, mapY).toByte(), k0x0008_StairsNorthSouthOrient)) {
mapX = mapX + _vm->_dirIntoStepCountEast[kDirEast]; mapX = mapX + _vm->_dirIntoStepCountEast[kDirEast];
mapY = mapY + _vm->_dirIntoStepCountNorth[kDirEast]; mapY = mapY + _vm->_dirIntoStepCountNorth[kDirEast];
} else { } else {
mapX = mapX + _vm->_dirIntoStepCountEast[kDirNorth]; mapX = mapX + _vm->_dirIntoStepCountEast[kDirNorth];
mapY = mapY + _vm->_dirIntoStepCountNorth[kDirNorth]; mapY = mapY + _vm->_dirIntoStepCountNorth[kDirNorth];
} }
return ((((L0256_i_SquareType = Square(f151_getSquare(mapX, mapY)).getType()) == k0_ElementTypeWall) || (L0256_i_SquareType == k3_ElementTypeStairs)) << 1) + L0257_B_NorthSouthOrientedStairs; int16 squareType = Square(f151_getSquare(mapX, mapY)).getType();
int16 retval = ((squareType == k0_ElementTypeWall) || (squareType == k3_ElementTypeStairs)) ? 1 : 0;
retval <<= 1;
retval += (northSouthOrientedStairs ? 1 : 0);
return retval;
} }
Thing DungeonMan::f167_getObjForProjectileLaucherOrObjGen(uint16 iconIndex) { Thing DungeonMan::f167_getObjForProjectileLaucherOrObjGen(uint16 iconIndex) {