diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json index 8978ef946185..0fa0f315d0e1 100644 --- a/data/json/vehicleparts/vehicle_parts.json +++ b/data/json/vehicleparts/vehicle_parts.json @@ -116,7 +116,7 @@ "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_bolt", 1 ] ] }, "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 1 ] ] } }, - "flags": [ "SEAT", "BOARDABLE", "CARGO", "BELTABLE" , "SHOCK_RESISTANT"], + "flags": [ "SEAT", "BOARDABLE", "CARGO", "BELTABLE", "SHOCK_RESISTANT" ], "breaks_into": "ig_vp_seat", "damage_reduction": { "all": 2 } }, diff --git a/src/vehicle.h b/src/vehicle.h index b453c5bf1bd4..126ec31340cb 100644 --- a/src/vehicle.h +++ b/src/vehicle.h @@ -112,7 +112,7 @@ struct veh_collision { //int veh? int part = 0; veh_coll_type type = veh_coll_nothing; - // Impulse, in Ns. Call impulse_to_damage or damage_to_impulse from vehicle_move.cpp for conversion to damage. + // Impulse, in Ns. Call impulse_to_damage or damage_to_impulse from vehicle_move.cpp for conversion to damage. int imp = 0; //vehicle void *target = nullptr; @@ -183,8 +183,8 @@ int mps_to_vmiph( double mps ); double vmiph_to_mps( int vmiph ); int cmps_to_vmiph( int cmps ); int vmiph_to_cmps( int vmiph ); -float impulse_to_damage(float impulse); -float damage_to_impulse(float damage); +float impulse_to_damage( float impulse ); +float damage_to_impulse( float damage ); class turret_data {