refactor: extract to vehicle_part.h

src/action.cpp

@@ -37,6 +37,7 @@
 #include "ui.h"
 #include "ui_manager.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 static const quality_id qual_BUTCHER( "BUTCHER" );

src/active_tile_data.cpp

@@ -11,6 +11,7 @@
 #include "mapbuffer.h"
 #include "rng.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_range.h"
 #include "weather.h"
 

src/activity_actor.cpp

@@ -48,6 +48,7 @@
 #include "uistate.h"
 #include "units.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 static const itype_id itype_bone_human( "bone_human" );

src/activity_handlers.cpp

@@ -103,6 +103,7 @@
 #include "value_ptr.h"
 #include "veh_interact.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 static const activity_id ACT_ADV_INVENTORY( "ACT_ADV_INVENTORY" );

src/activity_item_handling.cpp

@@ -70,6 +70,7 @@
 #include "value_ptr.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vehicle_selector.h"
 #include "vpart_position.h"
 #include "weather.h"

src/advanced_inv.cpp

@@ -55,6 +55,7 @@
 #include "units.h"
 #include "units_utility.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vehicle_selector.h"
 
 #if defined(__ANDROID__)

src/advanced_inv_area.cpp

@@ -29,6 +29,7 @@
 #include "uistate.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 int advanced_inv_area::get_item_count() const

src/advanced_inv_pane.cpp

@@ -18,6 +18,7 @@
 #include "uistate.h"
 #include "units.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 
 #if defined(__ANDROID__)
 #   include <SDL_keyboard.h>

src/avatar.cpp

@@ -74,6 +74,7 @@
 #include "ui.h"
 #include "value_ptr.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 static const activity_id ACT_READ( "ACT_READ" );

src/avatar_action.cpp

@@ -59,6 +59,7 @@
 #include "value_ptr.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 class player;

src/avatar_functions.cpp

@@ -20,6 +20,7 @@
 #include "trap.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 static const trait_id trait_CHLOROMORPH( "CHLOROMORPH" );

src/bionics.cpp

@@ -80,6 +80,7 @@
 #include "units_utility.h"
 #include "value_ptr.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "weather.h"
 #include "weather_gen.h"
@@ -496,7 +497,7 @@
     return cbm_list;
 }
 
 const std::map<item, bionic_id> npc::check_toggle_cbm()
 {
     std::map<item, bionic_id> res;
     const float allowed_ratio = static_cast<int>( rules.cbm_reserve ) / 100.0f;

src/cata_tiles.cpp

@@ -74,6 +74,7 @@
 #include "type_id.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "weather.h"
 #include "weighted_list.h"

src/character.cpp

@@ -98,6 +98,7 @@
 #include "veh_interact.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vehicle_selector.h"
 #include "vitamin.h"
 #include "vpart_position.h"

src/character_effects.cpp

@@ -16,6 +16,7 @@
 #include "trap.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "weather_gen.h"
 #include "weather.h"

src/character_functions.cpp

@@ -24,6 +24,7 @@
 #include "uistate.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vehicle_selector.h"
 #include "vpart_position.h"
 #include "weather_gen.h"

src/character_turn.cpp

@@ -23,6 +23,7 @@
 #include "trap.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "weather_gen.h"
 #include "weather.h"

src/clzones.cpp

@@ -36,6 +36,7 @@
 #include "ui.h"
 #include "value_ptr.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 static const std::string flag_FIREWOOD( "FIREWOOD" );

src/condition.cpp

@@ -39,6 +39,7 @@
 #include "string_id.h"
 #include "type_id.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 class basecamp;

src/construction.cpp

@@ -62,6 +62,7 @@
 #include "units_serde.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 static const activity_id ACT_BUILD( "ACT_BUILD" );

src/crafting.cpp

@@ -74,6 +74,7 @@
 #include "value_ptr.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vehicle_selector.h"
 #include "vpart_position.h"
 

src/creature.cpp

@@ -45,6 +45,7 @@
 #include "translations.h"
 #include "value_ptr.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 static const ammo_effect_str_id ammo_effect_APPLY_SAP( "APPLY_SAP" );

src/debug_menu.cpp

@@ -101,6 +101,7 @@
 #include "units_utility.h"
 #include "url_utility.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "veh_type.h"
 #include "vitamin.h"
 #include "vpart_position.h"

src/distribution_grid.cpp

@@ -68,6 +68,7 @@ void distribution_grid::update( time_point to )
 
 // TODO: Shouldn't be here
 #include "vehicle.h"
+#include "vehicle_part.h"
 static itype_id itype_battery( "battery" );
 int distribution_grid::mod_resource( int amt, bool recurse )
 {

src/dump.cpp

@@ -32,6 +32,7 @@
 #include "value_ptr.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vitamin.h"
 
 static const std::string flag_VARSIZE( "VARSIZE" );

src/editmap.cpp

@@ -54,6 +54,7 @@
 #include "ui_manager.h"
 #include "uistate.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 static constexpr tripoint editmap_boundary_min( 0, 0, -OVERMAP_DEPTH );

src/explosion.cpp

@@ -64,6 +64,7 @@
 #include "units.h"
 #include "ui_manager.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 static const ammo_effect_str_id ammo_effect_NULL_SOURCE( "NULL_SOURCE" );

src/faction_camp.cpp

@@ -73,6 +73,7 @@
 #include "value_ptr.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "vpart_range.h"
 #include "weather.h"

src/game.cpp

@@ -172,6 +172,7 @@
 #include "veh_interact.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "vpart_range.h"
 #include "wcwidth.h"

src/gates.cpp

@@ -33,6 +33,7 @@
 #include "type_id.h"
 #include "units.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 // Gates namespace

src/grab.cpp

@@ -14,6 +14,7 @@
 #include "point.h"
 #include "sounds.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "debug.h"
 #include "rng.h"

src/handle_action.cpp

@@ -86,6 +86,7 @@
 #include "units.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "vpart_range.h"
 #include "weather.h"

src/handle_liquid.cpp

@@ -36,6 +36,7 @@
 #include "type_id.h"
 #include "ui.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "vpart_range.h"
 

src/iexamine.cpp

@@ -106,6 +106,7 @@
 #include "units_utility.h"
 #include "value_ptr.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "weather.h"
 

src/inventory.cpp

@@ -24,6 +24,7 @@
 #include "options.h"
 #include "translations.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "calendar.h"
 #include "character.h"

src/inventory_ui.cpp

@@ -28,6 +28,7 @@
 #include "ui_manager.h"
 #include "units_utility.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vehicle_selector.h"
 #include "visitable.h"
 #include "vpart_position.h"

src/item.cpp

@@ -98,6 +98,7 @@
 #include "units_utility.h"
 #include "value_ptr.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vitamin.h"
 #include "vpart_position.h"
 #include "weather.h"

src/item_location.cpp

@@ -29,6 +29,7 @@
 #include "string_formatter.h"
 #include "translations.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vehicle_selector.h"
 #include "visitable.h"
 #include "vpart_position.h"

src/iuse.cpp

@@ -114,6 +114,7 @@
 #include "value_ptr.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vehicle_selector.h"
 #include "visitable.h"
 #include "vpart_position.h"
@@ -2633,7 +2634,7 @@
     ///\EFFECT_STR modifies dig rate
     // Adjust the dig rate if the player is above or below strength of 10.
     // Floor it at 1 so we don't divide by zero, of course!
     const double attr = 10 / std::max( 1, p->str_cur );
 
     // And now determine the moves...
     int dig_minutes = deep ? deep_pit_time : shallow_pit_time;

src/iuse_actor.cpp

@@ -80,6 +80,7 @@
 #include "units_utility.h"
 #include "value_ptr.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vehicle_selector.h"
 #include "visitable.h"
 #include "vitamin.h"

src/lightmap.cpp

@@ -38,6 +38,7 @@
 #include "type_id.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "vpart_range.h"
 #include "weather.h"

src/magic_spell_effect.cpp

@@ -51,6 +51,7 @@
 #include "type_id.h"
 #include "units.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 static const ammo_effect_str_id ammo_effect_magic( "magic" );

src/map.cpp

@@ -94,6 +94,7 @@
 #include "value_ptr.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "visitable.h"
 #include "vpart_position.h"
 #include "vpart_range.h"
@@ -117,7 +118,7 @@
 static const itype_id itype_forge( "forge" );
 static const itype_id itype_hotplate( "hotplate" );
 static const itype_id itype_kiln( "kiln" );
 static const itype_id itype_nail( "nail" );
 static const itype_id itype_press( "press" );
 static const itype_id itype_soldering_iron( "soldering_iron" );
 static const itype_id itype_vac_sealer( "vac_sealer" );

src/map_extras.cpp

@@ -55,6 +55,7 @@
 #include "units.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vehicle_group.h"
 #include "vpart_position.h"
 #include "vpart_range.h"

src/map_field.cpp

@@ -58,6 +58,7 @@
 #include "type_id.h"
 #include "units.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "weather.h"
 

src/mapgen.cpp

@@ -70,6 +70,7 @@
 #include "trap.h"
 #include "value_ptr.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vehicle_group.h"
 #include "vpart_position.h"
 #include "vpart_range.h"
@@ -83,9 +84,9 @@
 static const mongroup_id GROUP_HAZMATBOT( "GROUP_HAZMATBOT" );
 static const mongroup_id GROUP_LAB( "GROUP_LAB" );
 static const mongroup_id GROUP_LAB_CYBORG( "GROUP_LAB_CYBORG" );
 static const mongroup_id GROUP_NETHER( "GROUP_NETHER" );
 static const mongroup_id GROUP_PLAIN( "GROUP_PLAIN" );
 static const mongroup_id GROUP_ROBOT_SECUBOT( "GROUP_ROBOT_SECUBOT" );
 static const mongroup_id GROUP_SEWER( "GROUP_SEWER" );
 static const mongroup_id GROUP_SPIDER( "GROUP_SPIDER" );
 static const mongroup_id GROUP_TRIFFID( "GROUP_TRIFFID" );

src/mattack_actors.cpp

@@ -30,6 +30,7 @@
 #include "sounds.h"
 #include "translations.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_range.h"
 
 static const efftype_id effect_badpoison( "badpoison" );

src/melee.cpp

@@ -61,6 +61,7 @@
 #include "type_id.h"
 #include "units.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 #include "weighted_list.h"
 

src/monmove.cpp

@@ -46,6 +46,7 @@
 #include "translations.h"
 #include "trap.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "vpart_position.h"
 
 static const efftype_id effect_ai_waiting( "ai_waiting" );
@@ -119,7 +120,7 @@
 bool monster::will_move_to( const tripoint &p ) const
 {
     if( g->m.impassable( p ) ) {
         tripoint above_p( p.x, p.y, p.z + 1 );
         if( digging() ) {
             if( !g->m.has_flag( "BURROWABLE", p ) ) {
                 return false;
@@ -1582,7 +1583,7 @@
     // Allows climbing monsters to move on terrain with movecost <= 0
     Creature *critter = g->critter_at( destination, is_hallucination() );
     if( g->m.has_flag( "CLIMBABLE", destination ) ) {
         tripoint above_dest( destination.x, destination.y, destination.z + 1 );
         if( g->m.impassable( destination ) && critter == nullptr &&
             !g->m.has_floor_or_support( above_dest ) ) {
             if( flies() ) {

src/npc.cpp

@@ -71,6 +71,7 @@
 #include "value_ptr.h"
 #include "veh_type.h"
 #include "vehicle.h"
+#include "vehicle_part.h"
 #include "visitable.h"
 #include "vpart_position.h"
 #include "vpart_range.h"