refactor: extract vehicle_part to header

cataclysmbnteam · Sep 16, 2023 · d1b5233 · d1b5233
1 parent 88bbc1d
commit d1b5233
Show file tree

Hide file tree

Showing 99 changed files with 418 additions and 302 deletions.
diff --git a/src/action.cpp b/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" );

diff --git a/src/active_tile_data.cpp b/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"
 

diff --git a/src/activity_actor.cpp b/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" );

diff --git a/src/activity_handlers.cpp b/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" );

diff --git a/src/activity_item_handling.cpp b/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"

diff --git a/src/advanced_inv.cpp b/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__)

diff --git a/src/advanced_inv_area.cpp b/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

diff --git a/src/advanced_inv_pane.cpp b/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>

diff --git a/src/avatar.cpp b/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" );

diff --git a/src/avatar_action.cpp b/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;

diff --git a/src/avatar_functions.cpp b/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" );

diff --git a/src/bionics.cpp b/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"

diff --git a/src/cata_tiles.cpp b/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"

diff --git a/src/character.cpp b/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"

diff --git a/src/character_effects.cpp b/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"

diff --git a/src/character_functions.cpp b/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"

diff --git a/src/character_turn.cpp b/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"

diff --git a/src/clzones.cpp b/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" );

diff --git a/src/condition.cpp b/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;

diff --git a/src/construction.cpp b/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" );

diff --git a/src/crafting.cpp b/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"
 

diff --git a/src/creature.cpp b/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" );

diff --git a/src/debug_menu.cpp b/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"

diff --git a/src/distribution_grid.cpp b/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 )
 {

diff --git a/src/dump.cpp b/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" );

diff --git a/src/editmap.cpp b/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 );

diff --git a/src/explosion.cpp b/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" );

diff --git a/src/faction_camp.cpp b/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"

diff --git a/src/game.cpp b/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"

diff --git a/src/gates.cpp b/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

diff --git a/src/grab.cpp b/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"

diff --git a/src/handle_action.cpp b/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"

diff --git a/src/handle_liquid.cpp b/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"
 

diff --git a/src/iexamine.cpp b/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"
 

diff --git a/src/inventory.cpp b/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"

diff --git a/src/inventory_ui.cpp b/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"

diff --git a/src/item.cpp b/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"

diff --git a/src/item_location.cpp b/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"

diff --git a/src/iuse.cpp b/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"

diff --git a/src/iuse_actor.cpp b/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"

diff --git a/src/lightmap.cpp b/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"

diff --git a/src/magic_spell_effect.cpp b/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" );

diff --git a/src/map.cpp b/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"

diff --git a/src/map_extras.cpp b/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"

diff --git a/src/map_field.cpp b/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"
 

diff --git a/src/mapgen.cpp b/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"

diff --git a/src/mattack_actors.cpp b/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" );

diff --git a/src/melee.cpp b/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"
 

diff --git a/src/monmove.cpp b/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" );

diff --git a/src/npc.cpp b/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"