summaryrefslogtreecommitdiff
path: root/modules/bullet/area_bullet.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-12-06 21:36:34 +0100
committerRémi Verschelde <rverschelde@gmail.com>2017-12-07 08:02:00 +0100
commit13c2ff932089db24841bb971b645141218bd8586 (patch)
tree1fc056e9e5531b9d039ecfcf19602cdce33222d2 /modules/bullet/area_bullet.h
parenta8ceb7e3f213216e4fb103a6a8687d007632f788 (diff)
Style: Apply new clang-format 5.0 style to all files
Diffstat (limited to 'modules/bullet/area_bullet.h')
-rw-r--r--modules/bullet/area_bullet.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/modules/bullet/area_bullet.h b/modules/bullet/area_bullet.h
index f6e3b7e902..95ce62bfed 100644
--- a/modules/bullet/area_bullet.h
+++ b/modules/bullet/area_bullet.h
@@ -47,8 +47,8 @@ public:
ObjectID event_callback_id;
StringName event_callback_method;
- InOutEventCallback()
- : event_callback_id(0) {}
+ InOutEventCallback() :
+ event_callback_id(0) {}
};
enum OverlapState {
@@ -62,10 +62,12 @@ public:
CollisionObjectBullet *object;
OverlapState state;
- OverlappingObjectData()
- : object(NULL), state(OVERLAP_STATE_ENTER) {}
- OverlappingObjectData(CollisionObjectBullet *p_object, OverlapState p_state)
- : object(p_object), state(p_state) {}
+ OverlappingObjectData() :
+ object(NULL),
+ state(OVERLAP_STATE_ENTER) {}
+ OverlappingObjectData(CollisionObjectBullet *p_object, OverlapState p_state) :
+ object(p_object),
+ state(p_state) {}
OverlappingObjectData(const OverlappingObjectData &other) {
operator=(other);
}