diff options
| author | Colin Snover | 2017-11-08 16:46:05 -0600 |
|---|---|---|
| committer | Colin Snover | 2017-11-10 09:57:03 -0600 |
| commit | 51329c0dc6ee56d8b843f058aa3257ec9f30b71a (patch) | |
| tree | 85a171532e169bcce6f34a8c3d06555863ab4d0d /engines/dm/group.cpp | |
| parent | 2de83e09374abd10700e5f2bc4671318f182980b (diff) | |
| download | scummvm-rg350-51329c0dc6ee56d8b843f058aa3257ec9f30b71a.tar.gz scummvm-rg350-51329c0dc6ee56d8b843f058aa3257ec9f30b71a.tar.bz2 scummvm-rg350-51329c0dc6ee56d8b843f058aa3257ec9f30b71a.zip | |
ALL: Fix misuse of comma operator
Diffstat (limited to 'engines/dm/group.cpp')
| -rw-r--r-- | engines/dm/group.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/dm/group.cpp b/engines/dm/group.cpp index 9bfeb1da1d..dfdcdc017f 100644 --- a/engines/dm/group.cpp +++ b/engines/dm/group.cpp @@ -819,7 +819,8 @@ T0209058_MoveInRandomDirection: do { AL0450_i_DestinationMapX = eventMapX; AL0451_i_DestinationMapY = eventMapY; - AL0450_i_DestinationMapX += _vm->_dirIntoStepCountEast[AL0446_i_Direction], AL0451_i_DestinationMapY += _vm->_dirIntoStepCountNorth[AL0446_i_Direction]; + AL0450_i_DestinationMapX += _vm->_dirIntoStepCountEast[AL0446_i_Direction]; + AL0451_i_DestinationMapY += _vm->_dirIntoStepCountNorth[AL0446_i_Direction]; if (((activeGroup->_priorMapX != AL0450_i_DestinationMapX) || (activeGroup->_priorMapY != AL0451_i_DestinationMapY) || (moveToPriorLocation = !_vm->getRandomNumber(4))) /* 1/4 chance of moving back to the square that the creature comes from */ @@ -910,7 +911,8 @@ T0209085_SingleSquareMove: (!_vm->getRandomNumber(4) && isMovementPossible(&creatureInfo, eventMapX, eventMapY, AL0446_i_Direction = _vm->returnOppositeDir((Direction)primaryDirectionToOrFromParty), false))) { AL0450_i_DestinationMapX = eventMapX; AL0451_i_DestinationMapY = eventMapY; - AL0450_i_DestinationMapX += _vm->_dirIntoStepCountEast[AL0446_i_Direction], AL0451_i_DestinationMapY += _vm->_dirIntoStepCountNorth[AL0446_i_Direction]; + AL0450_i_DestinationMapX += _vm->_dirIntoStepCountEast[AL0446_i_Direction]; + AL0451_i_DestinationMapY += _vm->_dirIntoStepCountNorth[AL0446_i_Direction]; goto T0209061_MoveGroup; } if (isArchEnemy) { @@ -922,7 +924,8 @@ T0209089_DoubleSquareMove: ((_fluxCageCount >= 2) && isArchenemyDoubleMovementPossible(&creatureInfo, eventMapX, eventMapY, AL0446_i_Direction = _vm->returnOppositeDir((Direction)primaryDirectionToOrFromParty)))) { AL0450_i_DestinationMapX = eventMapX; AL0451_i_DestinationMapY = eventMapY; - AL0450_i_DestinationMapX += _vm->_dirIntoStepCountEast[AL0446_i_Direction] * 2, AL0451_i_DestinationMapY += _vm->_dirIntoStepCountNorth[AL0446_i_Direction] * 2; + AL0450_i_DestinationMapX += _vm->_dirIntoStepCountEast[AL0446_i_Direction] * 2; + AL0451_i_DestinationMapY += _vm->_dirIntoStepCountNorth[AL0446_i_Direction] * 2; _vm->_sound->requestPlay(kDMSoundIndexBuzz, AL0450_i_DestinationMapX, AL0451_i_DestinationMapY, kDMSoundModePlayIfPrioritized); goto T0209061_MoveGroup; } @@ -1451,7 +1454,8 @@ bool GroupMan::isArchenemyDoubleMovementPossible(CreatureInfo *info, int16 mapX, if (_fluxCages[dir]) return false; - mapX += _vm->_dirIntoStepCountEast[dir], mapY += _vm->_dirIntoStepCountNorth[dir]; + mapX += _vm->_dirIntoStepCountEast[dir]; + mapY += _vm->_dirIntoStepCountNorth[dir]; return isMovementPossible(info, mapX, mapY, dir, false); } |