Skip to content

Commit

Permalink
Format
Browse files Browse the repository at this point in the history
  • Loading branch information
grantramsay committed Mar 1, 2020
1 parent 909b60b commit fa63c7a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
7 changes: 2 additions & 5 deletions apps/freeablo/faworld/missile/missile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,15 @@
namespace FAWorld::Missile
{
Missile::Missile(MissileId missileId, Actor& creator, Misc::Point dest)
: mCreator(&creator), mMissileId(missileId), mLevel(creator.getLevel()),
mSrcPoint(creator.getPos().current()), mAttr(Attributes::fromId(missileId))
: mCreator(&creator), mMissileId(missileId), mLevel(creator.getLevel()), mSrcPoint(creator.getPos().current()), mAttr(Attributes::fromId(missileId))
{
mAttr.mCreation(*this, dest);

if (!missileData().mSoundEffect.empty())
Engine::ThreadManager::get()->playSound(missileData().mSoundEffect);
}

Missile::Missile(FASaveGame::GameLoader& loader)
: mMissileId(static_cast<MissileId>(loader.load<int32_t>())),
mAttr(Attributes::fromId(mMissileId))
Missile::Missile(FASaveGame::GameLoader& loader) : mMissileId(static_cast<MissileId>(loader.load<int32_t>())), mAttr(Attributes::fromId(mMissileId))
{
auto creatorId = loader.load<int32_t>();
auto levelIndex = loader.load<int32_t>();
Expand Down
6 changes: 3 additions & 3 deletions apps/freeablo/faworld/missile/missile.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace FAWorld::Missile
{
public:
Creation() = delete;
typedef std::function<void (Missile& missile, Misc::Point dest)> Method;
typedef std::function<void(Missile& missile, Misc::Point dest)> Method;

static void singleFrame16Direction(Missile& missile, Misc::Point dest);
static void animated16Direction(Missile& missile, Misc::Point dest);
Expand All @@ -50,7 +50,7 @@ namespace FAWorld::Missile
{
public:
Movement() = delete;
typedef std::function<void (Missile& missile, MissileGraphic& graphic)> Method;
typedef std::function<void(Missile& missile, MissileGraphic& graphic)> Method;

static void stationary(Missile& missile, MissileGraphic& graphic);
static Method linear(FixedPoint speed);
Expand All @@ -64,7 +64,7 @@ namespace FAWorld::Missile
{
public:
ActorEngagement() = delete;
typedef std::function<void (Missile& missile, MissileGraphic& graphic, Actor& actor)> Method;
typedef std::function<void(Missile& missile, MissileGraphic& graphic, Actor& actor)> Method;

static void none(Missile& missile, MissileGraphic& graphic, Actor& actor);
static void damageEnemy(Missile& missile, MissileGraphic& graphic, Actor& actor);
Expand Down

0 comments on commit fa63c7a

Please sign in to comment.