diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-01 17:26:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-01 17:26:13 +0100 |
| commit | 0033e72a0f4d5ec271340fae86e0b64445720330 (patch) | |
| tree | 0408490c937f6a91d6935dd2ab4dab2891badd48 /servers | |
| parent | 4cb64feae8f118529a5e1108c13d8fe05771857f (diff) | |
| parent | 08d4bfacafa8abe435d51a6afecb276030a23280 (diff) | |
Merge pull request #16276 from bcr3ative/issue_15668
Fix inconsistencies and typos in argument names
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/physics/physics_server_sw.cpp | 4 | ||||
| -rw-r--r-- | servers/physics_2d_server.cpp | 4 | ||||
| -rw-r--r-- | servers/physics_server.h | 2 | ||||
| -rw-r--r-- | servers/visual/visual_server_scene.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/servers/physics/physics_server_sw.cpp b/servers/physics/physics_server_sw.cpp index 5681ca838a..ea0d372281 100644 --- a/servers/physics/physics_server_sw.cpp +++ b/servers/physics/physics_server_sw.cpp @@ -795,12 +795,12 @@ void PhysicsServerSW::body_set_axis_velocity(RID p_body, const Vector3 &p_axis_v body->wakeup(); }; -void PhysicsServerSW::body_set_axis_lock(RID p_body, BodyAxis p_axis, bool lock) { +void PhysicsServerSW::body_set_axis_lock(RID p_body, BodyAxis p_axis, bool p_lock) { BodySW *body = body_owner.get(p_body); ERR_FAIL_COND(!body); - body->set_axis_lock(p_axis, lock); + body->set_axis_lock(p_axis, p_lock); body->wakeup(); } diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp index 180abc406c..5f08cd9243 100644 --- a/servers/physics_2d_server.cpp +++ b/servers/physics_2d_server.cpp @@ -168,9 +168,9 @@ float Physics2DShapeQueryParameters::get_margin() const { return margin; } -void Physics2DShapeQueryParameters::set_collision_mask(int p_collision_layer) { +void Physics2DShapeQueryParameters::set_collision_mask(int p_collision_mask) { - collision_mask = p_collision_layer; + collision_mask = p_collision_mask; } int Physics2DShapeQueryParameters::get_collision_mask() const { diff --git a/servers/physics_server.h b/servers/physics_server.h index 8b8b8f856d..94fc8d479d 100644 --- a/servers/physics_server.h +++ b/servers/physics_server.h @@ -118,7 +118,7 @@ public: void set_margin(float p_margin); float get_margin() const; - void set_collision_mask(int p_collision_layer); + void set_collision_mask(int p_collision_mask); int get_collision_mask() const; void set_exclude(const Vector<RID> &p_exclude); diff --git a/servers/visual/visual_server_scene.h b/servers/visual/visual_server_scene.h index 206503e643..109cdf711c 100644 --- a/servers/visual/visual_server_scene.h +++ b/servers/visual/visual_server_scene.h @@ -457,7 +457,7 @@ public: virtual void instance_set_visible(RID p_instance, bool p_visible); virtual void instance_set_use_lightmap(RID p_instance, RID p_lightmap_instance, RID p_lightmap); - virtual void instance_set_custom_aabb(RID p_insatnce, AABB aabb); + virtual void instance_set_custom_aabb(RID p_instance, AABB p_aabb); virtual void instance_attach_skeleton(RID p_instance, RID p_skeleton); virtual void instance_set_exterior(RID p_instance, bool p_enabled); |