diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-28 14:20:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-28 14:20:58 +0100 |
| commit | d2d359d67c5c35351ed953448430536c57db1522 (patch) | |
| tree | 95f1027d97b3e6fb9ceb21f7b768730d81f6beb1 /servers/physics_2d/body_2d_sw.cpp | |
| parent | bbbdabc771662d0effb739237967982cd201ea89 (diff) | |
| parent | 60d486acc80de3ccf621df769fac27aa27ad4a10 (diff) | |
Merge pull request #37379 from akien-mga/server-renames-followup
More server renames for consistency after #37361
Diffstat (limited to 'servers/physics_2d/body_2d_sw.cpp')
| -rw-r--r-- | servers/physics_2d/body_2d_sw.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/servers/physics_2d/body_2d_sw.cpp b/servers/physics_2d/body_2d_sw.cpp index 79388ffe93..11cf1339bc 100644 --- a/servers/physics_2d/body_2d_sw.cpp +++ b/servers/physics_2d/body_2d_sw.cpp @@ -601,7 +601,7 @@ void Body2DSW::call_queries() { if (fi_callback) { - Physics2DDirectBodyStateSW *dbs = Physics2DDirectBodyStateSW::singleton; + PhysicsDirectBodyState2DSW *dbs = PhysicsDirectBodyState2DSW::singleton; dbs->body = this; Variant v = dbs; @@ -706,14 +706,14 @@ Body2DSW::~Body2DSW() { memdelete(fi_callback); } -Physics2DDirectBodyStateSW *Physics2DDirectBodyStateSW::singleton = NULL; +PhysicsDirectBodyState2DSW *PhysicsDirectBodyState2DSW::singleton = NULL; -PhysicsDirectSpaceState2D *Physics2DDirectBodyStateSW::get_space_state() { +PhysicsDirectSpaceState2D *PhysicsDirectBodyState2DSW::get_space_state() { return body->get_space()->get_direct_state(); } -Variant Physics2DDirectBodyStateSW::get_contact_collider_shape_metadata(int p_contact_idx) const { +Variant PhysicsDirectBodyState2DSW::get_contact_collider_shape_metadata(int p_contact_idx) const { ERR_FAIL_INDEX_V(p_contact_idx, body->contact_count, Variant()); |