diff options
| author | Bendegúz Nagy | 2016-09-03 16:01:31 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-09-03 16:01:31 +0200 |
| commit | 3191f2605bbb28704a88ecbf9faa72b62bcb12e7 (patch) | |
| tree | 413ce7400974973147382e0d9948e993d1fa81c8 /engines/dm/group.cpp | |
| parent | d0bae5b805797fa44dc6a68f925fdad718d36284 (diff) | |
| parent | fbe9c92ce1418238d5aaed3e88f7982d80fd375d (diff) | |
| download | scummvm-rg350-3191f2605bbb28704a88ecbf9faa72b62bcb12e7.tar.gz scummvm-rg350-3191f2605bbb28704a88ecbf9faa72b62bcb12e7.tar.bz2 scummvm-rg350-3191f2605bbb28704a88ecbf9faa72b62bcb12e7.zip | |
Merge branch 'dm' of https://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 09581f72ae..fe80a1013c 100644 --- a/engines/dm/group.cpp +++ b/engines/dm/group.cpp @@ -280,7 +280,7 @@ void GroupMan::dropCreatureFixedPossessions(uint16 creatureType, int16 mapX, int continue; Weapon *currWeapon = (Weapon *)_vm->_dungeonMan->getThingData(nextUnusedThing); -/* The same pointer type is used no matter the actual type k5_WeaponThingType, k6_ArmourThingType or k10_JunkThingType */ + /* The same pointer type is used no matter the actual type k5_WeaponThingType, k6_ArmourThingType or k10_JunkThingType */ currWeapon->setType(currFixedPossession); currWeapon->setCursed(cursedPossessions); nextUnusedThing = thingWithNewCell(nextUnusedThing, ((cell == k255_CreatureTypeSingleCenteredCreature) || !_vm->getRandomNumber(4)) ? _vm->getRandomNumber(4) : cell); @@ -1789,7 +1789,7 @@ int16 GroupMan::getMeleeTargetCreatureOrdinal(int16 groupX, int16 groupY, int16 } } -int16 GroupMan::getMeleeActionDamage(Champion* champ, int16 champIndex, Group* group, int16 creatureIndex, int16 mapX, int16 mapY, uint16 actionHitProbability, uint16 actionDamageFactor, int16 skillIndex) { +int16 GroupMan::getMeleeActionDamage(Champion *champ, int16 champIndex, Group *group, int16 creatureIndex, int16 mapX, int16 mapY, uint16 actionHitProbability, uint16 actionDamageFactor, int16 skillIndex) { int16 L0565_i_Damage = 0; int16 L0566_i_Damage = 0; int16 L0568_i_Defense; @@ -1996,7 +1996,7 @@ void GroupMan::fuseAction(uint16 mapX, uint16 mapY) { } } -void GroupMan::saveActiveGroupPart(Common::OutSaveFile* file) { +void GroupMan::saveActiveGroupPart(Common::OutSaveFile *file) { for (uint16 i = 0; i < _maxActiveGroupCount; ++i) { ActiveGroup *group = &_activeGroups[i]; file->writeUint16BE(group->_groupThingIndex); @@ -2015,7 +2015,7 @@ void GroupMan::saveActiveGroupPart(Common::OutSaveFile* file) { } } -void GroupMan::loadActiveGroupPart(Common::InSaveFile* file) { +void GroupMan::loadActiveGroupPart(Common::InSaveFile *file) { for (uint16 i = 0; i < _maxActiveGroupCount; ++i) { ActiveGroup *group = &_activeGroups[i]; group->_groupThingIndex = file->readUint16BE(); |