diff options
| author | Bendegúz Nagy | 2016-09-05 19:05:02 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-09-05 19:05:02 +0200 |
| commit | 4befd3a23214953632d1cdc5ba32d2bd1bb7293d (patch) | |
| tree | c164877888bf1b68c32cbf3cde87444148d9fe12 /engines/dm/group.cpp | |
| parent | 3191f2605bbb28704a88ecbf9faa72b62bcb12e7 (diff) | |
| parent | 4663d190c4112279cfbb321d7edebd78dafcb161 (diff) | |
| download | scummvm-rg350-4befd3a23214953632d1cdc5ba32d2bd1bb7293d.tar.gz scummvm-rg350-4befd3a23214953632d1cdc5ba32d2bd1bb7293d.tar.bz2 scummvm-rg350-4befd3a23214953632d1cdc5ba32d2bd1bb7293d.zip | |
Merge branch 'dm' of github.com:WinterGrascph/scummvm into dm
Diffstat (limited to 'engines/dm/group.cpp')
| -rw-r--r-- | engines/dm/group.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/dm/group.cpp b/engines/dm/group.cpp index fe80a1013c..160c97de99 100644 --- a/engines/dm/group.cpp +++ b/engines/dm/group.cpp @@ -1727,7 +1727,7 @@ Thing GroupMan::groupGetGenerated(int16 creatureType, int16 healthMultiplier, ui || (groupThing == Thing::_none)) { return Thing::_none; } - Group *group = (Group*)_vm->_dungeonMan->getThingData(groupThing); + Group *group = (Group *)_vm->_dungeonMan->getThingData(groupThing); group->_slot = Thing::_endOfList; group->setDoNotDiscard(false); group->setDir(dir); @@ -1776,7 +1776,7 @@ int16 GroupMan::getMeleeTargetCreatureOrdinal(int16 groupX, int16 groupY, int16 if (groupThing == Thing::_endOfList) return 0; - Group *group = (Group*)_vm->_dungeonMan->getThingData(groupThing); + Group *group = (Group *)_vm->_dungeonMan->getThingData(groupThing); signed char orderedCellsToAttack[4]; setOrderedCellsToAttack(orderedCellsToAttack, groupX, groupY, partyX, partyY, champCell); uint16 counter = 0; @@ -1882,7 +1882,7 @@ void GroupMan::fluxCageAction(int16 mapX, int16 mapY) { return; _vm->_dungeonMan->linkThingToList(unusedThing, Thing(0), mapX, mapY); - (((Explosion*)_vm->_dungeonMan->_thingData[k15_ExplosionThingType])[unusedThing.getIndex()]).setType(k50_ExplosionType_Fluxcage); + (((Explosion *)_vm->_dungeonMan->_thingData[k15_ExplosionThingType])[unusedThing.getIndex()]).setType(k50_ExplosionType_Fluxcage); TimelineEvent newEvent; setMapAndTime(newEvent._mapTime, _vm->_dungeonMan->_currMapIndex, _vm->_gameTime + 100); newEvent._type = k24_TMEventTypeRemoveFluxcage; @@ -1935,7 +1935,7 @@ bool GroupMan::isFluxcageOnSquare(int16 mapX, int16 mapY) { Thing thing = _vm->_dungeonMan->getSquareFirstThing(mapX, mapY); while (thing != Thing::_endOfList) { - if ((thing.getType() == k15_ExplosionThingType) && (((Explosion*)_vm->_dungeonMan->_thingData[k15_ExplosionThingType])[thing.getIndex()].getType() == k50_ExplosionType_Fluxcage)) + if ((thing.getType() == k15_ExplosionThingType) && (((Explosion *)_vm->_dungeonMan->_thingData[k15_ExplosionThingType])[thing.getIndex()].getType() == k50_ExplosionType_Fluxcage)) return true; thing = _vm->_dungeonMan->getNextThing(thing); |