Removed unused global variables

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" );
 

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" );

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" );

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<point, base_camps::direction_data> base_camps::all_directions = {
     // direction, direction id, tab order, direction abbreviation with bracket, direction tab title

src/cata_tiles.cpp

@@ -84,7 +84,6 @@ static const std::array<std::string, 8> 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<std::string, 12> TILE_CATEGORY_IDS = {{
         "", // C_NONE,

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
 {

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 {

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" );

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" );
 

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 );

src/item.cpp

@@ -98,22 +98,14 @@ 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" );
 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" );

src/iuse.cpp

@@ -107,17 +107,14 @@
 
 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" );
 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" );

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__ << ": "
 

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" );

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" );

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.

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" );

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" );

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" );

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()
 {

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" );

src/npcmove.cpp

@@ -77,17 +77,14 @@ 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" );
 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" );

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" );

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" );