1 files changed, 4 insertions, 18 deletions
diff --git a/scene/3d/vehicle_body.h b/scene/3d/vehicle_body.h
index b4420e95e7..1ac3693cc4 100644
--- a/scene/3d/vehicle_body.h
+++ b/scene/3d/vehicle_body.h
@@ -27,6 +27,7 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
+
 #ifndef VEHICLE_BODY_H
 #define VEHICLE_BODY_H
 
@@ -138,20 +139,13 @@ public:
 	VehicleWheel();
 };
 
-class VehicleBody : public PhysicsBody {
-
-	GDCLASS(VehicleBody, PhysicsBody);
+class VehicleBody : public RigidBody {
 
-	real_t mass;
-	real_t friction;
+	GDCLASS(VehicleBody, RigidBody);
 
 	float engine_force;
 	float brake;
 
-	Vector3 linear_velocity;
-	Vector3 angular_velocity;
-	bool ccd;
-
 	real_t m_pitchControl;
 	real_t m_steeringValue;
 	real_t m_currentVehicleSpeedKmHour;
@@ -174,7 +168,7 @@ class VehicleBody : public PhysicsBody {
 		btVehicleWheelContactPoint(PhysicsDirectBodyState *s, PhysicsBody *body1, const Vector3 &frictionPosWorld, const Vector3 &frictionDirectionWorld, real_t maxImpulse);
 	};
 
-	void _resolve_single_bilateral(PhysicsDirectBodyState *s, const Vector3 &pos1, PhysicsBody *body2, const Vector3 &pos2, const Vector3 &normal, real_t &impulse);
+	void _resolve_single_bilateral(PhysicsDirectBodyState *s, const Vector3 &pos1, PhysicsBody *body2, const Vector3 &pos2, const Vector3 &normal, real_t &impulse, real_t p_rollInfluence);
 	real_t _calc_rolling_friction(btVehicleWheelContactPoint &contactPoint);
 
 	void _update_friction(PhysicsDirectBodyState *s);
@@ -191,12 +185,6 @@ class VehicleBody : public PhysicsBody {
 	void _direct_state_changed(Object *p_state);
 
 public:
-	void set_mass(real_t p_mass);
-	real_t get_mass() const;
-
-	void set_friction(real_t p_friction);
-	real_t get_friction() const;
-
 	void set_engine_force(float p_engine_force);
 	float get_engine_force() const;
 
@@ -206,8 +194,6 @@ public:
 	void set_steering(float p_steering);
 	float get_steering() const;
 
-	Vector3 get_linear_velocity() const;
-
 	VehicleBody();
 };