diff options
| author | TwistedTwigleg | 2017-08-11 15:10:05 -0400 |
|---|---|---|
| committer | Rémi Verschelde | 2017-08-16 17:22:23 +0200 |
| commit | 00f6c859282bb4dab3f6b4f6c20c44222221ebe9 (patch) | |
| tree | ab3d2bae1ce8e9661480535a6442c94e5aeafd83 /scene/resources/shape_2d.h | |
| parent | b1ecaaa22b8dd87a75db414cb84ad0f60d5d4cef (diff) | |
| download | godot-00f6c859282bb4dab3f6b4f6c20c44222221ebe9.tar.gz godot-00f6c859282bb4dab3f6b4f6c20c44222221ebe9.tar.zst godot-00f6c859282bb4dab3f6b4f6c20c44222221ebe9.zip | |
Synchronize parameter names in definition and declaration
Fixes #10244.
Diffstat (limited to 'scene/resources/shape_2d.h')
| -rw-r--r-- | scene/resources/shape_2d.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/shape_2d.h b/scene/resources/shape_2d.h index a752b8dbe..c020fb914 100644 --- a/scene/resources/shape_2d.h +++ b/scene/resources/shape_2d.h @@ -47,10 +47,10 @@ public: void set_custom_solver_bias(real_t p_bias); real_t get_custom_solver_bias() const; - bool collide_with_motion(const Transform2D &p_local_xform, const Vector2 &p_local_motion, const Ref<Shape2D> &p_shape, const Transform2D &p_shape_xform, const Vector2 &p_p_shape_motion); + bool collide_with_motion(const Transform2D &p_local_xform, const Vector2 &p_local_motion, const Ref<Shape2D> &p_shape, const Transform2D &p_shape_xform, const Vector2 &p_shape_motion); bool collide(const Transform2D &p_local_xform, const Ref<Shape2D> &p_shape, const Transform2D &p_shape_xform); - Variant collide_with_motion_and_get_contacts(const Transform2D &p_local_xform, const Vector2 &p_local_motion, const Ref<Shape2D> &p_shape, const Transform2D &p_shape_xform, const Vector2 &p_p_shape_motion); + Variant collide_with_motion_and_get_contacts(const Transform2D &p_local_xform, const Vector2 &p_local_motion, const Ref<Shape2D> &p_shape, const Transform2D &p_shape_xform, const Vector2 &p_shape_motion); Variant collide_and_get_contacts(const Transform2D &p_local_xform, const Ref<Shape2D> &p_shape, const Transform2D &p_shape_xform); virtual void draw(const RID &p_to_rid, const Color &p_color) {} |