From 5f3db7677e8479c2f97ca29c8c3949d58f7fa338 Mon Sep 17 00:00:00 2001 From: ZhilkinSerg Date: Wed, 11 Dec 2019 01:02:32 +0300 Subject: [PATCH] Removed unused global variables --- src/activity_handlers.cpp | 3 --- src/activity_item_handling.cpp | 1 - src/avatar.cpp | 2 -- src/basecamp.cpp | 1 - src/cata_tiles.cpp | 1 - src/debug_menu.cpp | 1 - src/faction_camp.cpp | 1 - src/game.cpp | 12 ----------- src/handle_action.cpp | 1 - src/iexamine.cpp | 2 -- src/item.cpp | 8 ------- src/iuse.cpp | 5 ----- src/map.cpp | 4 ---- src/map_field.cpp | 2 -- src/melee.cpp | 1 - src/mission_start.cpp | 5 ----- src/monattack.cpp | 4 ---- src/mondeath.cpp | 2 -- src/monexamine.cpp | 1 - src/monmove.cpp | 4 ---- src/monster.cpp | 4 ---- src/npcmove.cpp | 3 --- src/npctalk.cpp | 12 ----------- src/npctalk_funcs.cpp | 4 ---- src/player.cpp | 36 -------------------------------- src/player_hardcoded_effects.cpp | 1 - src/ranged.cpp | 1 - src/savegame_json.cpp | 1 - src/start_location.cpp | 2 -- src/trapfunc.cpp | 1 - src/veh_interact.cpp | 2 -- src/visitable.cpp | 2 -- src/weather.cpp | 1 - 33 files changed, 131 deletions(-) diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp index 0091687ac6154..824517c357a44 100644 --- a/src/activity_handlers.cpp +++ b/src/activity_handlers.cpp @@ -106,15 +106,12 @@ static const skill_id skill_computer( "computer" ); static const species_id HUMAN( "HUMAN" ); static const species_id ZOMBIE( "ZOMBIE" ); -static const efftype_id effect_bleed( "bleed" ); static const efftype_id effect_blind( "blind" ); static const efftype_id effect_narcosis( "narcosis" ); -static const efftype_id effect_milked( "milked" ); static const efftype_id effect_sleep( "sleep" ); static const efftype_id effect_under_op( "under_operation" ); static const efftype_id effect_pet( "pet" ); static const efftype_id effect_controlled( "controlled" ); -static const efftype_id effect_saddled( "saddled" ); static const trait_id trait_ILLITERATE( "ILLITERATE" ); diff --git a/src/activity_item_handling.cpp b/src/activity_item_handling.cpp index 34c7e6edf664a..1b858bf0f6302 100644 --- a/src/activity_item_handling.cpp +++ b/src/activity_item_handling.cpp @@ -60,7 +60,6 @@ static const efftype_id effect_pet( "pet" ); static const zone_type_id zone_source_firewood( "SOURCE_FIREWOOD" ); static const zone_type_id z_loot_unsorted( "LOOT_UNSORTED" ); -static const quality_id LIFT( "LIFT" ); static const quality_id WELD( "WELD" ); static const trap_str_id tr_firewood_source( "tr_firewood_source" ); diff --git a/src/avatar.cpp b/src/avatar.cpp index 789e5e3bf9eb1..a0617571e10ad 100644 --- a/src/avatar.cpp +++ b/src/avatar.cpp @@ -72,14 +72,12 @@ static const efftype_id effect_depressants( "depressants" ); static const efftype_id effect_happy( "happy" ); static const efftype_id effect_irradiated( "irradiated" ); static const efftype_id effect_pkill( "pkill" ); -static const efftype_id effect_riding( "riding" ); static const efftype_id effect_sad( "sad" ); static const efftype_id effect_sleep( "sleep" ); static const efftype_id effect_sleep_deprived( "sleep_deprived" ); static const efftype_id effect_slept_through_alarm( "slept_through_alarm" ); static const efftype_id effect_stim( "stim" ); static const efftype_id effect_stim_overdose( "stim_overdose" ); -static const efftype_id effect_winded( "winded" ); static const bionic_id bio_eye_optic( "bio_eye_optic" ); static const bionic_id bio_memory( "bio_memory" ); diff --git a/src/basecamp.cpp b/src/basecamp.cpp index e64ed703b4876..1921c4126683b 100644 --- a/src/basecamp.cpp +++ b/src/basecamp.cpp @@ -37,7 +37,6 @@ #include "line.h" static const zone_type_id z_camp_storage( "CAMP_STORAGE" ); -static const zone_type_id z_loot_ignore( "LOOT_IGNORE" ); const std::map base_camps::all_directions = { // direction, direction id, tab order, direction abbreviation with bracket, direction tab title diff --git a/src/cata_tiles.cpp b/src/cata_tiles.cpp index 7161350f41c87..4f39d817fc565 100644 --- a/src/cata_tiles.cpp +++ b/src/cata_tiles.cpp @@ -84,7 +84,6 @@ static const std::array multitile_keys = {{ extern int fontwidth; extern int fontheight; static const efftype_id effect_ridden( "ridden" ); -static const efftype_id effect_riding( "riding" ); static const std::string empty_string; static const std::array TILE_CATEGORY_IDS = {{ "", // C_NONE, diff --git a/src/debug_menu.cpp b/src/debug_menu.cpp index 82b057e00a859..bb5b3c1974238 100644 --- a/src/debug_menu.cpp +++ b/src/debug_menu.cpp @@ -92,7 +92,6 @@ class vehicle; #endif #define dbg(x) DebugLog((x),D_GAME) << __FILE__ << ":" << __LINE__ << ": " -static const efftype_id effect_riding( "riding" ); static const efftype_id effect_flu( "flu" ); namespace debug_menu { diff --git a/src/faction_camp.cpp b/src/faction_camp.cpp index 89a75ca3b6541..5c0dddfe399eb 100644 --- a/src/faction_camp.cpp +++ b/src/faction_camp.cpp @@ -91,7 +91,6 @@ static const skill_id skill_swimming( "swimming" ); static const trait_id trait_DEBUG_HS( "DEBUG_HS" ); static const zone_type_id z_camp_storage( "CAMP_STORAGE" ); -static const zone_type_id z_loot_ignore( "LOOT_IGNORE" ); static const zone_type_id z_camp_food( "CAMP_FOOD" ); struct mass_volume { diff --git a/src/game.cpp b/src/game.cpp index d257a733a1ca8..a56e166ea20d7 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -177,29 +177,20 @@ static const skill_id skill_survival( "survival" ); static const skill_id skill_electronics( "electronics" ); static const skill_id skill_computer( "computer" ); -static const species_id ZOMBIE( "ZOMBIE" ); static const species_id PLANT( "PLANT" ); static const efftype_id effect_adrenaline_mycus( "adrenaline_mycus" ); -static const efftype_id effect_alarm_clock( "alarm_clock" ); -static const efftype_id effect_amigara( "amigara" ); static const efftype_id effect_assisted( "assisted" ); static const efftype_id effect_blind( "blind" ); static const efftype_id effect_boomered( "boomered" ); static const efftype_id effect_bouldering( "bouldering" ); static const efftype_id effect_contacts( "contacts" ); static const efftype_id effect_controlled( "controlled" ); -static const efftype_id effect_deaf( "deaf" ); static const efftype_id effect_docile( "docile" ); static const efftype_id effect_downed( "downed" ); static const efftype_id effect_drunk( "drunk" ); -static const efftype_id effect_emp( "emp" ); static const efftype_id effect_evil( "evil" ); static const efftype_id effect_flu( "flu" ); -static const efftype_id effect_glowing( "glowing" ); -static const efftype_id effect_has_bag( "has_bag" ); -static const efftype_id effect_harnessed( "harnessed" ); -static const efftype_id effect_hot( "hot" ); static const efftype_id effect_infected( "infected" ); static const efftype_id effect_laserlocked( "laserlocked" ); static const efftype_id effect_no_sight( "no_sight" ); @@ -208,15 +199,12 @@ static const efftype_id effect_onfire( "onfire" ); static const efftype_id effect_pacified( "pacified" ); static const efftype_id effect_paid( "paid" ); static const efftype_id effect_pet( "pet" ); -static const efftype_id effect_relax_gas( "relax_gas" ); static const efftype_id effect_ridden( "ridden" ); static const efftype_id effect_riding( "riding" ); static const efftype_id effect_sleep( "sleep" ); static const efftype_id effect_stunned( "stunned" ); -static const efftype_id effect_teleglow( "teleglow" ); static const efftype_id effect_tetanus( "tetanus" ); static const efftype_id effect_tied( "tied" ); -static const efftype_id effect_visuals( "visuals" ); static const efftype_id effect_winded( "winded" ); static const bionic_id bio_remote( "bio_remote" ); diff --git a/src/handle_action.cpp b/src/handle_action.cpp index 5e8d17a5559a0..62baa729ba48a 100644 --- a/src/handle_action.cpp +++ b/src/handle_action.cpp @@ -72,7 +72,6 @@ static const efftype_id effect_alarm_clock( "alarm_clock" ); static const efftype_id effect_laserlocked( "laserlocked" ); static const efftype_id effect_relax_gas( "relax_gas" ); -static const efftype_id effect_riding( "riding" ); static const bionic_id bio_remote( "bio_remote" ); diff --git a/src/iexamine.cpp b/src/iexamine.cpp index 787dfa6cf969f..083ad7a15bd00 100644 --- a/src/iexamine.cpp +++ b/src/iexamine.cpp @@ -126,8 +126,6 @@ static const trait_id trait_THRESH_MARLOSS( "THRESH_MARLOSS" ); static const trait_id trait_THRESH_MYCUS( "THRESH_MYCUS" ); static const trap_str_id tr_unfinished_construction( "tr_unfinished_construction" ); -static const zone_type_id z_loot_unsorted( "LOOT_UNSORTED" ); - static void pick_plant( player &p, const tripoint &examp, const std::string &itemType, ter_id new_ter, bool seeds = false ); diff --git a/src/item.cpp b/src/item.cpp index 0c2a6fd34a2f7..2d7ec4e3633c2 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -98,9 +98,6 @@ static const skill_id skill_cooking( "cooking" ); static const quality_id quality_jack( "JACK" ); static const quality_id quality_lift( "LIFT" ); -static const species_id FISH( "FISH" ); -static const species_id BIRD( "BIRD" ); -static const species_id INSECT( "INSECT" ); static const species_id ROBOT( "ROBOT" ); static const efftype_id effect_cig( "cig" ); @@ -108,12 +105,7 @@ static const efftype_id effect_shakes( "shakes" ); static const efftype_id effect_sleep( "sleep" ); static const efftype_id effect_weed_high( "weed_high" ); -static const material_id mat_leather( "leather" ); -static const material_id mat_kevlar( "kevlar" ); - -static const fault_id fault_gun_dirt( "fault_gun_dirt" ); static const fault_id fault_gun_blackpowder( "fault_gun_blackpowder" ); -static const fault_id fault_gun_unlubricated( "fault_gun_unlubricated" ); static const trait_id trait_small2( "SMALL2" ); static const trait_id trait_small_ok( "SMALL_OK" ); diff --git a/src/iuse.cpp b/src/iuse.cpp index b65e05361c5fb..11bcde534917d 100644 --- a/src/iuse.cpp +++ b/src/iuse.cpp @@ -107,9 +107,7 @@ static const mtype_id mon_bee( "mon_bee" ); static const mtype_id mon_blob( "mon_blob" ); -static const mtype_id mon_cat( "mon_cat" ); static const mtype_id mon_hologram( "mon_hologram" ); -static const mtype_id mon_dog( "mon_dog" ); static const mtype_id mon_dog_thing( "mon_dog_thing" ); static const mtype_id mon_fly( "mon_fly" ); static const mtype_id mon_hallu_multicooker( "mon_hallu_multicooker" ); @@ -117,7 +115,6 @@ static const mtype_id mon_shadow( "mon_shadow" ); static const mtype_id mon_spore( "mon_spore" ); static const mtype_id mon_vortex( "mon_vortex" ); static const mtype_id mon_wasp( "mon_wasp" ); -static const mtype_id mon_cow( "mon_cow" ); static const skill_id skill_firstaid( "firstaid" ); static const skill_id skill_survival( "survival" ); @@ -185,7 +182,6 @@ static const efftype_id effect_paincysts( "paincysts" ); static const efftype_id effect_panacea( "panacea" ); static const efftype_id effect_pet( "pet" ); static const efftype_id effect_poison( "poison" ); -static const efftype_id effect_recover( "recover" ); static const efftype_id effect_ridden( "ridden" ); static const efftype_id effect_riding( "riding" ); static const efftype_id effect_run( "run" ); @@ -213,7 +209,6 @@ static const efftype_id effect_took_prozac_bad( "took_prozac_bad" ); static const efftype_id effect_took_prozac_visible( "took_prozac_visible" ); static const efftype_id effect_took_thorazine( "took_thorazine" ); static const efftype_id effect_took_thorazine_bad( "took_thorazine_bad" ); -static const efftype_id effect_took_thorazine_visible( "took_thorazine_visible" ); static const efftype_id effect_took_xanax( "took_xanax" ); static const efftype_id effect_took_xanax_visible( "took_xanax_visible" ); static const efftype_id effect_valium( "valium" ); diff --git a/src/map.cpp b/src/map.cpp index ba4bf6175c5a3..c1f27e7a6b5fd 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -87,12 +87,8 @@ static const mtype_id mon_zombie( "mon_zombie" ); static const skill_id skill_traps( "traps" ); -static const species_id ZOMBIE( "ZOMBIE" ); - static const efftype_id effect_boomered( "boomered" ); static const efftype_id effect_crushed( "crushed" ); -static const efftype_id effect_stunned( "stunned" ); -static const efftype_id effect_riding( "riding" ); #define dbg(x) DebugLog((x),D_MAP) << __FILE__ << ":" << __LINE__ << ": " diff --git a/src/map_field.cpp b/src/map_field.cpp index 6118219cd42c8..253306c4de5c1 100644 --- a/src/map_field.cpp +++ b/src/map_field.cpp @@ -70,8 +70,6 @@ static const efftype_id effect_corroding( "corroding" ); static const efftype_id effect_fungus( "fungus" ); static const efftype_id effect_onfire( "onfire" ); static const efftype_id effect_poison( "poison" ); -static const efftype_id effect_relax_gas( "relax_gas" ); -static const efftype_id effect_sap( "sap" ); static const efftype_id effect_stung( "stung" ); static const efftype_id effect_stunned( "stunned" ); static const efftype_id effect_teargas( "teargas" ); diff --git a/src/melee.cpp b/src/melee.cpp index 5cad0b4e113d5..a3ff9bb4296f2 100644 --- a/src/melee.cpp +++ b/src/melee.cpp @@ -85,7 +85,6 @@ static const efftype_id effect_hit_by_player( "hit_by_player" ); static const efftype_id effect_lightsnare( "lightsnare" ); static const efftype_id effect_narcosis( "narcosis" ); static const efftype_id effect_poison( "poison" ); -static const efftype_id effect_riding( "riding" ); static const efftype_id effect_stunned( "stunned" ); static const trait_id trait_CLAWS( "CLAWS" ); diff --git a/src/mission_start.cpp b/src/mission_start.cpp index 864c96e9949c2..ea08e2e866002 100644 --- a/src/mission_start.cpp +++ b/src/mission_start.cpp @@ -26,19 +26,14 @@ #include "optional.h" #include "rng.h" -static const mtype_id mon_charred_nightmare( "mon_charred_nightmare" ); static const mtype_id mon_dog( "mon_dog" ); -static const mtype_id mon_jabberwock( "mon_jabberwock" ); static const mtype_id mon_zombie( "mon_zombie" ); static const mtype_id mon_zombie_brute( "mon_zombie_brute" ); static const mtype_id mon_zombie_dog( "mon_zombie_dog" ); -static const mtype_id mon_zombie_electric( "mon_zombie_electric" ); static const mtype_id mon_zombie_hulk( "mon_zombie_hulk" ); static const mtype_id mon_zombie_master( "mon_zombie_master" ); static const mtype_id mon_zombie_necro( "mon_zombie_necro" ); -static const efftype_id effect_infection( "infection" ); - /* These functions are responsible for making changes to the game at the moment * the mission is accepted by the player. They are also responsible for * updating *miss with the target and any other important information. diff --git a/src/monattack.cpp b/src/monattack.cpp index afa81e44ad622..81cd5ac744c87 100644 --- a/src/monattack.cpp +++ b/src/monattack.cpp @@ -72,13 +72,9 @@ #include "point.h" #include "units.h" -static const mtype_id mon_ant( "mon_ant" ); -static const mtype_id mon_ant_acid( "mon_ant_acid" ); static const mtype_id mon_ant_acid_larva( "mon_ant_acid_larva" ); -static const mtype_id mon_ant_acid_soldier( "mon_ant_acid_soldier" ); static const mtype_id mon_ant_acid_queen( "mon_ant_acid_queen" ); static const mtype_id mon_ant_larva( "mon_ant_larva" ); -static const mtype_id mon_ant_soldier( "mon_ant_soldier" ); static const mtype_id mon_biollante( "mon_biollante" ); static const mtype_id mon_blob( "mon_blob" ); static const mtype_id mon_blob_brain( "mon_blob_brain" ); diff --git a/src/mondeath.cpp b/src/mondeath.cpp index 396976c16d662..1765d11a97258 100644 --- a/src/mondeath.cpp +++ b/src/mondeath.cpp @@ -60,9 +60,7 @@ static const mtype_id mon_sewer_rat( "mon_sewer_rat" ); static const mtype_id mon_thing( "mon_thing" ); static const mtype_id mon_zombie_dancer( "mon_zombie_dancer" ); static const mtype_id mon_zombie_hulk( "mon_zombie_hulk" ); -static const mtype_id mon_giant_cockroach( "mon_giant_cockroach" ); static const mtype_id mon_giant_cockroach_nymph( "mon_giant_cockroach_nymph" ); -static const mtype_id mon_pregnant_giant_cockroach( "mon_pregnant_giant_cockroach" ); static const species_id ZOMBIE( "ZOMBIE" ); static const species_id BLOB( "BLOB" ); diff --git a/src/monexamine.cpp b/src/monexamine.cpp index 1f74e2871f743..735ae2c6996a9 100644 --- a/src/monexamine.cpp +++ b/src/monexamine.cpp @@ -47,7 +47,6 @@ static const efftype_id effect_monster_armor( "monster_armor" ); static const efftype_id effect_paid( "paid" ); static const efftype_id effect_pet( "pet" ); static const efftype_id effect_tied( "tied" ); -static const efftype_id effect_riding( "riding" ); static const efftype_id effect_ridden( "ridden" ); static const efftype_id effect_saddled( "monster_saddled" ); static const skill_id skill_survival( "survival" ); diff --git a/src/monmove.cpp b/src/monmove.cpp index 1fcd40af4ee42..16ba4eb4eb80e 100644 --- a/src/monmove.cpp +++ b/src/monmove.cpp @@ -53,7 +53,6 @@ static const efftype_id effect_docile( "docile" ); static const efftype_id effect_downed( "downed" ); static const efftype_id effect_dragging( "dragging" ); static const efftype_id effect_grabbed( "grabbed" ); -static const efftype_id effect_narcosis( "narcosis" ); static const efftype_id effect_no_sight( "no_sight" ); static const efftype_id effect_operating( "operating" ); static const efftype_id effect_pacified( "pacified" ); @@ -62,9 +61,6 @@ static const efftype_id effect_stunned( "stunned" ); static const efftype_id effect_harnessed( "harnessed" ); static const species_id ZOMBIE( "ZOMBIE" ); -static const species_id BLOB( "BLOB" ); -static const species_id ROBOT( "ROBOT" ); -static const species_id WORM( "WORM" ); bool monster::wander() { diff --git a/src/monster.cpp b/src/monster.cpp index 7235b3e912f5a..db64e6f85de8d 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -66,7 +66,6 @@ static const mtype_id mon_ant( "mon_ant" ); static const mtype_id mon_ant_fungus( "mon_ant_fungus" ); static const mtype_id mon_ant_queen( "mon_ant_queen" ); static const mtype_id mon_ant_soldier( "mon_ant_soldier" ); -static const mtype_id mon_bee( "mon_bee" ); static const mtype_id mon_beekeeper( "mon_beekeeper" ); static const mtype_id mon_boomer( "mon_boomer" ); static const mtype_id mon_boomer_huge( "mon_boomer_huge" ); @@ -98,7 +97,6 @@ static const mtype_id mon_zombie_master( "mon_zombie_master" ); static const mtype_id mon_zombie_necro( "mon_zombie_necro" ); static const mtype_id mon_zombie_rot( "mon_zombie_rot" ); static const mtype_id mon_zombie_scientist( "mon_zombie_scientist" ); -static const mtype_id mon_zombie_scorched( "mon_zombie_scorched" ); static const mtype_id mon_zombie_shrieker( "mon_zombie_shrieker" ); static const mtype_id mon_zombie_smoker( "mon_zombie_smoker" ); static const mtype_id mon_zombie_smoker_fungus( "mon_zombie_smoker_fungus" ); @@ -150,11 +148,9 @@ static const efftype_id effect_onfire( "onfire" ); static const efftype_id effect_pacified( "pacified" ); static const efftype_id effect_paralyzepoison( "paralyzepoison" ); static const efftype_id effect_poison( "poison" ); -static const efftype_id effect_riding( "riding" ); static const efftype_id effect_ridden( "ridden" ); static const efftype_id effect_saddled( "saddled" ); static const efftype_id effect_run( "run" ); -static const efftype_id effect_shrieking( "shrieking" ); static const efftype_id effect_stunned( "stunned" ); static const efftype_id effect_supercharged( "supercharged" ); static const efftype_id effect_tied( "tied" ); diff --git a/src/npcmove.cpp b/src/npcmove.cpp index 30b908c4ebbf5..05cf3a5981881 100644 --- a/src/npcmove.cpp +++ b/src/npcmove.cpp @@ -77,9 +77,7 @@ static const efftype_id effect_catch_up( "catch_up" ); static const efftype_id effect_hallu( "hallu" ); static const efftype_id effect_hit_by_player( "hit_by_player" ); static const efftype_id effect_infected( "infected" ); -static const efftype_id effect_infection( "infection" ); static const efftype_id effect_lying_down( "lying_down" ); -static const efftype_id effect_under_op( "under_operation" ); static const efftype_id effect_no_sight( "no_sight" ); static const efftype_id effect_stunned( "stunned" ); static const efftype_id effect_onfire( "onfire" ); @@ -87,7 +85,6 @@ static const efftype_id effect_npc_run_away( "npc_run_away" ); static const efftype_id effect_npc_fire_bad( "npc_fire_bad" ); static const efftype_id effect_npc_flee_player( "npc_flee_player" ); static const efftype_id effect_npc_player_looking( "npc_player_still_looking" ); -static const efftype_id effect_ridden( "ridden" ); // power source CBMs static const bionic_id bio_advreactor( "bio_advreactor" ); diff --git a/src/npctalk.cpp b/src/npctalk.cpp index 7ff8264863e36..247479174d4c8 100644 --- a/src/npctalk.cpp +++ b/src/npctalk.cpp @@ -77,18 +77,6 @@ class basecamp; static const skill_id skill_speech( "speech" ); -static const efftype_id effect_allow_sleep( "allow_sleep" ); -static const efftype_id effect_asked_for_item( "asked_for_item" ); -static const efftype_id effect_asked_personal_info( "asked_personal_info" ); -static const efftype_id effect_asked_to_follow( "asked_to_follow" ); -static const efftype_id effect_asked_to_lead( "asked_to_lead" ); -static const efftype_id effect_asked_to_train( "asked_to_train" ); -static const efftype_id effect_bite( "bite" ); -static const efftype_id effect_bleed( "bleed" ); -static const efftype_id effect_currently_busy( "currently_busy" ); -static const efftype_id effect_gave_quest_item( "gave_quest_item" ); -static const efftype_id effect_infected( "infected" ); -static const efftype_id effect_infection( "infection" ); static const efftype_id effect_lying_down( "lying_down" ); static const efftype_id effect_narcosis( "narcosis" ); static const efftype_id effect_npc_suspend( "npc_suspend" ); diff --git a/src/npctalk_funcs.cpp b/src/npctalk_funcs.cpp index edc515a1aab13..fddad96c87ac2 100644 --- a/src/npctalk_funcs.cpp +++ b/src/npctalk_funcs.cpp @@ -67,10 +67,6 @@ static const efftype_id effect_lying_down( "lying_down" ); static const efftype_id effect_npc_suspend( "npc_suspend" ); static const efftype_id effect_sleep( "sleep" ); static const efftype_id effect_pet( "pet" ); -static const efftype_id effect_controlled( "controlled" ); -static const efftype_id effect_riding( "riding" ); -static const efftype_id effect_ridden( "ridden" ); -static const efftype_id effect_saddled( "monster_saddled" ); static const mtype_id mon_horse( "mon_horse" ); static const mtype_id mon_cow( "mon_cow" ); diff --git a/src/player.cpp b/src/player.cpp index f34ed69a27b56..e1d3eba89c426 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -110,48 +110,30 @@ static const skill_id skill_gun( "gun" ); static const skill_id skill_swimming( "swimming" ); static const efftype_id effect_adrenaline( "adrenaline" ); -static const efftype_id effect_alarm_clock( "alarm_clock" ); -static const efftype_id effect_asthma( "asthma" ); -static const efftype_id effect_attention( "attention" ); static const efftype_id effect_bandaged( "bandaged" ); static const efftype_id effect_bite( "bite" ); static const efftype_id effect_blind( "blind" ); static const efftype_id effect_bloodworms( "bloodworms" ); static const efftype_id effect_boomered( "boomered" ); static const efftype_id effect_brainworms( "brainworms" ); -static const efftype_id effect_cig( "cig" ); static const efftype_id effect_common_cold( "common_cold" ); static const efftype_id effect_contacts( "contacts" ); -static const efftype_id effect_corroding( "corroding" ); -static const efftype_id effect_cough_suppress( "cough_suppress" ); static const efftype_id effect_recently_coughed( "recently_coughed" ); static const efftype_id effect_darkness( "darkness" ); -static const efftype_id effect_datura( "datura" ); static const efftype_id effect_deaf( "deaf" ); -static const efftype_id effect_depressants( "depressants" ); static const efftype_id effect_dermatik( "dermatik" ); -static const efftype_id effect_disabled( "disabled" ); static const efftype_id effect_disinfected( "disinfected" ); static const efftype_id effect_downed( "downed" ); static const efftype_id effect_drunk( "drunk" ); static const efftype_id effect_earphones( "earphones" ); -static const efftype_id effect_evil( "evil" ); static const efftype_id effect_flu( "flu" ); -static const efftype_id effect_foodpoison( "foodpoison" ); -static const efftype_id effect_formication( "formication" ); static const efftype_id effect_fungus( "fungus" ); -static const efftype_id effect_glowy_led( "glowy_led" ); static const efftype_id effect_got_checked( "got_checked" ); static const efftype_id effect_grabbed( "grabbed" ); static const efftype_id effect_grabbing( "grabbing" ); -static const efftype_id effect_hallu( "hallu" ); -static const efftype_id effect_happy( "happy" ); static const efftype_id effect_infected( "infected" ); -static const efftype_id effect_iodine( "iodine" ); -static const efftype_id effect_irradiated( "irradiated" ); static const efftype_id effect_jetinjector( "jetinjector" ); static const efftype_id effect_lack_sleep( "lack_sleep" ); -static const efftype_id effect_sleep_deprived( "sleep_deprived" ); static const efftype_id effect_lying_down( "lying_down" ); static const efftype_id effect_mending( "mending" ); static const efftype_id effect_meth( "meth" ); @@ -160,31 +142,13 @@ static const efftype_id effect_nausea( "nausea" ); static const efftype_id effect_no_sight( "no_sight" ); static const efftype_id effect_onfire( "onfire" ); static const efftype_id effect_paincysts( "paincysts" ); -static const efftype_id effect_pkill( "pkill" ); -static const efftype_id effect_pkill1( "pkill1" ); -static const efftype_id effect_pkill2( "pkill2" ); -static const efftype_id effect_pkill3( "pkill3" ); static const efftype_id effect_recover( "recover" ); -static const efftype_id effect_riding( "riding" ); -static const efftype_id effect_sad( "sad" ); -static const efftype_id effect_shakes( "shakes" ); static const efftype_id effect_sleep( "sleep" ); -static const efftype_id effect_slept_through_alarm( "slept_through_alarm" ); -static const efftype_id effect_spores( "spores" ); -static const efftype_id effect_stim( "stim" ); -static const efftype_id effect_stim_overdose( "stim_overdose" ); static const efftype_id effect_stunned( "stunned" ); static const efftype_id effect_tapeworm( "tapeworm" ); -static const efftype_id effect_took_thorazine( "took_thorazine" ); -static const efftype_id effect_valium( "valium" ); -static const efftype_id effect_visuals( "visuals" ); static const efftype_id effect_weed_high( "weed_high" ); static const efftype_id effect_winded( "winded" ); -static const efftype_id effect_bleed( "bleed" ); static const efftype_id effect_magnesium_supplements( "magnesium" ); -static const efftype_id effect_pet( "pet" ); - -static const species_id ROBOT( "ROBOT" ); static const bionic_id bio_armor_arms( "bio_armor_arms" ); static const bionic_id bio_armor_eyes( "bio_armor_eyes" ); diff --git a/src/player_hardcoded_effects.cpp b/src/player_hardcoded_effects.cpp index da4b5876179ee..7914c99e38e21 100644 --- a/src/player_hardcoded_effects.cpp +++ b/src/player_hardcoded_effects.cpp @@ -52,7 +52,6 @@ static const efftype_id effect_bloodworms( "bloodworms" ); static const efftype_id effect_boomered( "boomered" ); static const efftype_id effect_brainworms( "brainworms" ); static const efftype_id effect_cold( "cold" ); -static const efftype_id effect_cough_suppress( "cough_suppress" ); static const efftype_id effect_datura( "datura" ); static const efftype_id effect_dermatik( "dermatik" ); static const efftype_id effect_disabled( "disabled" ); diff --git a/src/ranged.cpp b/src/ranged.cpp index dbe961e27d4da..24d82a174ced2 100644 --- a/src/ranged.cpp +++ b/src/ranged.cpp @@ -71,7 +71,6 @@ static const skill_id skill_launcher( "launcher" ); static const efftype_id effect_on_roof( "on_roof" ); static const efftype_id effect_hit_by_player( "hit_by_player" ); -static const efftype_id effect_riding( "riding" ); static const efftype_id effect_downed( "downed" ); static const trait_id trait_PYROMANIA( "PYROMANIA" ); diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp index 5bb1fbbfb0e76..5578676c311ce 100644 --- a/src/savegame_json.cpp +++ b/src/savegame_json.cpp @@ -102,7 +102,6 @@ struct mutation_branch; static const trait_id trait_HYPEROPIC( "HYPEROPIC" ); static const trait_id trait_MYOPIC( "MYOPIC" ); static const efftype_id effect_riding( "riding" ); -static const efftype_id effect_ridden( "ridden" ); static const std::array obj_type_name = { { "OBJECT_NONE", "OBJECT_ITEM", "OBJECT_ACTOR", "OBJECT_PLAYER", "OBJECT_NPC", "OBJECT_MONSTER", "OBJECT_VEHICLE", "OBJECT_TRAP", "OBJECT_FIELD", diff --git a/src/start_location.cpp b/src/start_location.cpp index 701b17ac48e58..d4e9458764f12 100644 --- a/src/start_location.cpp +++ b/src/start_location.cpp @@ -28,8 +28,6 @@ class item; -static const efftype_id effect_bleed( "bleed" ); - namespace { generic_factory all_starting_locations( "starting location", "ident" ); diff --git a/src/trapfunc.cpp b/src/trapfunc.cpp index 5d0039ad0c784..153fe3ea46938 100644 --- a/src/trapfunc.cpp +++ b/src/trapfunc.cpp @@ -49,7 +49,6 @@ static const efftype_id effect_lightsnare( "lightsnare" ); static const efftype_id effect_slimed( "slimed" ); static const efftype_id effect_tetanus( "tetanus" ); static const efftype_id effect_ridden( "ridden" ); -static const efftype_id effect_riding( "riding" ); static const trait_id trait_INFIMMUNE( "INFIMMUNE" ); static const trait_id trait_INFRESIST( "INFRESIST" ); diff --git a/src/veh_interact.cpp b/src/veh_interact.cpp index a0df517cd2fcf..2fc44e147ea6a 100644 --- a/src/veh_interact.cpp +++ b/src/veh_interact.cpp @@ -59,8 +59,6 @@ static const trait_id trait_DEBUG_HS( "DEBUG_HS" ); -static const efftype_id effect_riding( "riding" ); - class player; static inline std::string status_color( bool status ) diff --git a/src/visitable.cpp b/src/visitable.cpp index 8a191d4e99231..343d4b3641bff 100644 --- a/src/visitable.cpp +++ b/src/visitable.cpp @@ -26,8 +26,6 @@ #include "colony.h" #include "point.h" -static const efftype_id effect_riding( "riding" ); - /** @relates visitable */ template item *visitable::find_parent( const item &it ) diff --git a/src/weather.cpp b/src/weather.cpp index 1948ced63cc73..6e1caf490e456 100644 --- a/src/weather.cpp +++ b/src/weather.cpp @@ -39,7 +39,6 @@ static const efftype_id effect_glare( "glare" ); static const efftype_id effect_snow_glare( "snow_glare" ); -static const efftype_id effect_blind( "blind" ); static const efftype_id effect_sleep( "sleep" ); static const trait_id trait_CEPH_VISION( "CEPH_VISION" );