aboutsummaryrefslogtreecommitdiff
path: root/engines/dm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/dm')
-rw-r--r--engines/dm/projexpl.cpp8
-rw-r--r--engines/dm/projexpl.h2
2 files changed, 4 insertions, 6 deletions
diff --git a/engines/dm/projexpl.cpp b/engines/dm/projexpl.cpp
index e1a62d1836..7c4bc53337 100644
--- a/engines/dm/projexpl.cpp
+++ b/engines/dm/projexpl.cpp
@@ -35,7 +35,7 @@
namespace DM {
-ProjExpl::ProjExpl(DMEngine* vm) : _vm(vm) {
+ProjExpl::ProjExpl(DMEngine *vm) : _vm(vm) {
_creatureDamageOutcome = 0;
_secondaryDirToOrFromParty = 0;
_lastCreatureAttackTime = -200;
@@ -396,7 +396,7 @@ void ProjExpl::processEvents48To49(TimelineEvent *event) {
TimelineEvent *curEvent = &firstEvent;
Thing projectileThingNewCell = Thing(curEvent->_B._slot);
Thing projectileThing = projectileThingNewCell;
- Projectile *projectile = (Projectile*)_vm->_dungeonMan->getThingData(projectileThing);
+ Projectile *projectile = (Projectile *)_vm->_dungeonMan->getThingData(projectileThing);
int16 destinationMapX = curEvent->_C._projectile.getMapX();
int16 destinationMapY = curEvent->_C._projectile.getMapY();
@@ -472,7 +472,7 @@ void ProjExpl::processEvents48To49(TimelineEvent *event) {
void ProjExpl::processEvent25(TimelineEvent *event) {
uint16 mapX = event->_B._location._mapX;
uint16 mapY = event->_B._location._mapY;
- Explosion *explosion = &((Explosion*)_vm->_dungeonMan->_thingData[k15_ExplosionThingType])[Thing((event->_C._slot)).getIndex()];
+ Explosion *explosion = &((Explosion *)_vm->_dungeonMan->_thingData[k15_ExplosionThingType])[Thing((event->_C._slot)).getIndex()];
int16 curSquareType = Square(_vm->_dungeonMan->_currMapData[mapX][mapY]).getType();
bool explosionOnPartySquare = (_vm->_dungeonMan->_currMapIndex == _vm->_dungeonMan->_partyMapIndex) && (mapX == _vm->_dungeonMan->_partyMapX) && (mapY == _vm->_dungeonMan->_partyMapY);
Thing groupThing = _vm->_groupMan->groupGetThing(mapX, mapY);
@@ -482,7 +482,7 @@ void ProjExpl::processEvent25(TimelineEvent *event) {
uint16 creatureType = 0;
if (groupThing != Thing::_endOfList) {
- group = (Group*)_vm->_dungeonMan->getThingData(groupThing);
+ group = (Group *)_vm->_dungeonMan->getThingData(groupThing);
creatureType = group->_type;
creatureInfo = &_vm->_dungeonMan->_creatureInfos[creatureType];
}
diff --git a/engines/dm/projexpl.h b/engines/dm/projexpl.h
index e8db0bf8d3..7559fef361 100644
--- a/engines/dm/projexpl.h
+++ b/engines/dm/projexpl.h
@@ -29,7 +29,6 @@
#include "dm/dm.h"
-
namespace DM {
#define k0_outcomeKilledNoCreaturesInGroup 0 // @ C0_OUTCOME_KILLED_NO_CREATURES_IN_GROUP
@@ -71,7 +70,6 @@ namespace DM {
#define k32_soundMOVE_RED_DRAGON 32 // @ C32_SOUND_MOVE_RED_DRAGON
#define k33_soundMOVE_SKELETON 33 // @ C33_SOUND_MOVE_SKELETON
-
#define M31_setMap(map_time, map) ((map_time) = (((map_time) & 0x00FFFFFF) | (((int32)(map)) << 24)))
class TimelineEvent;