diff --git a/src/item.cpp b/src/item.cpp index 45b6536c72043..e2d63e42fa999 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -187,10 +187,6 @@ static const matec_id RAPID( "RAPID" ); static const material_id material_wool( "wool" ); -static const mon_flag_str_id mon_flag_DORMANT( "DORMANT" ); -static const mon_flag_str_id mon_flag_POISON( "POISON" ); -static const mon_flag_str_id mon_flag_REVIVES( "REVIVES" ); - static const morale_type morale_null( "morale_null" ); static const mtype_id debug_mon( "debug_mon" ); diff --git a/src/magic_spell_effect.cpp b/src/magic_spell_effect.cpp index 2b4772a92410c..b09c4b5ea0daf 100644 --- a/src/magic_spell_effect.cpp +++ b/src/magic_spell_effect.cpp @@ -76,10 +76,6 @@ static const json_character_flag json_flag_PRED2( "PRED2" ); static const json_character_flag json_flag_PRED3( "PRED3" ); static const json_character_flag json_flag_PRED4( "PRED4" ); -static const mon_flag_str_id mon_flag_DORMANT( "DORMANT" ); -static const mon_flag_str_id mon_flag_NO_NECRO( "NO_NECRO" ); -static const mon_flag_str_id mon_flag_REVIVES( "REVIVES" ); - static const mtype_id mon_blob( "mon_blob" ); static const mtype_id mon_blob_brain( "mon_blob_brain" ); static const mtype_id mon_blob_large( "mon_blob_large" ); diff --git a/src/mondeath.cpp b/src/mondeath.cpp index 15cfe225709e0..6bb6e70936c65 100644 --- a/src/mondeath.cpp +++ b/src/mondeath.cpp @@ -54,11 +54,6 @@ static const efftype_id effect_no_ammo( "no_ammo" ); static const harvest_drop_type_id harvest_drop_bone( "bone" ); static const harvest_drop_type_id harvest_drop_flesh( "flesh" ); -static const mon_flag_str_id mon_flag_DROPS_AMMO( "DROPS_AMMO" ); -static const mon_flag_str_id mon_flag_NOGIB( "NOGIB" ); -static const mon_flag_str_id mon_flag_SILENT_DISAPPEAR( "SILENT_DISAPPEAR" ); -static const mon_flag_str_id mon_flag_QUIETDEATH( "QUIETDEATH" ); - static const species_id species_ZOMBIE( "ZOMBIE" ); item_location mdeath::normal( monster &z ) diff --git a/src/monster.cpp b/src/monster.cpp index 1ed2b529516fb..fa20c350bf79a 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -157,61 +157,6 @@ static const mfaction_str_id monfaction_bee( "bee" ); static const mfaction_str_id monfaction_nether_player_hate( "nether_player_hate" ); static const mfaction_str_id monfaction_wasp( "wasp" ); -static const mon_flag_str_id mon_flag_ANIMAL( "ANIMAL" ); -static const mon_flag_str_id mon_flag_AQUATIC( "AQUATIC" ); -static const mon_flag_str_id mon_flag_ATTACK_LOWER( "ATTACK_LOWER" ); -static const mon_flag_str_id mon_flag_ATTACK_UPPER( "ATTACK_UPPER" ); -static const mon_flag_str_id mon_flag_BADVENOM( "BADVENOM" ); -static const mon_flag_str_id mon_flag_CAN_DIG( "CAN_DIG" ); -static const mon_flag_str_id mon_flag_CLIMBS( "CLIMBS" ); -static const mon_flag_str_id mon_flag_CORNERED_FIGHTER( "CORNERED_FIGHTER" ); -static const mon_flag_str_id mon_flag_DIGS( "DIGS" ); -static const mon_flag_str_id mon_flag_DORMANT( "DORMANT" ); -static const mon_flag_str_id mon_flag_EATS( "EATS" ); -static const mon_flag_str_id mon_flag_ELECTRIC( "ELECTRIC" ); -static const mon_flag_str_id mon_flag_ELECTRIC_FIELD( "ELECTRIC_FIELD" ); -static const mon_flag_str_id mon_flag_ELECTRONIC( "ELECTRONIC" ); -static const mon_flag_str_id mon_flag_FILTHY( "FILTHY" ); -static const mon_flag_str_id mon_flag_FIREY( "FIREY" ); -static const mon_flag_str_id mon_flag_FLIES( "FLIES" ); -static const mon_flag_str_id mon_flag_GOODHEARING( "GOODHEARING" ); -static const mon_flag_str_id mon_flag_GRABS( "GRABS" ); -static const mon_flag_str_id mon_flag_HAS_MIND( "HAS_MIND" ); -static const mon_flag_str_id mon_flag_HEARS( "HEARS" ); -static const mon_flag_str_id mon_flag_HIT_AND_RUN( "HIT_AND_RUN" ); -static const mon_flag_str_id mon_flag_HUMAN( "HUMAN" ); -static const mon_flag_str_id mon_flag_IMMOBILE( "IMMOBILE" ); -static const mon_flag_str_id mon_flag_KEEP_DISTANCE( "KEEP_DISTANCE" ); -static const mon_flag_str_id mon_flag_MILKABLE( "MILKABLE" ); -static const mon_flag_str_id mon_flag_NEMESIS( "NEMESIS" ); -static const mon_flag_str_id mon_flag_NEVER_WANDER( "NEVER_WANDER" ); -static const mon_flag_str_id mon_flag_NOHEAD( "NOHEAD" ); -static const mon_flag_str_id mon_flag_NO_BREATHE( "NO_BREATHE" ); -static const mon_flag_str_id mon_flag_NO_BREED( "NO_BREED" ); -static const mon_flag_str_id mon_flag_NO_FUNG_DMG( "NO_FUNG_DMG" ); -static const mon_flag_str_id mon_flag_PARALYZEVENOM( "PARALYZEVENOM" ); -static const mon_flag_str_id mon_flag_PATH_AVOID_DANGER_1( "PATH_AVOID_DANGER_1" ); -static const mon_flag_str_id mon_flag_PATH_AVOID_DANGER_2( "PATH_AVOID_DANGER_2" ); -static const mon_flag_str_id mon_flag_PATH_AVOID_FALL( "PATH_AVOID_FALL" ); -static const mon_flag_str_id mon_flag_PATH_AVOID_FIRE( "PATH_AVOID_FIRE" ); -static const mon_flag_str_id mon_flag_PET_MOUNTABLE( "PET_MOUNTABLE" ); -static const mon_flag_str_id mon_flag_PET_WONT_FOLLOW( "PET_WONT_FOLLOW" ); -static const mon_flag_str_id mon_flag_PHOTOPHOBIC( "PHOTOPHOBIC" ); -static const mon_flag_str_id mon_flag_PLASTIC( "PLASTIC" ); -static const mon_flag_str_id mon_flag_PRIORITIZE_TARGETS( "PRIORITIZE_TARGETS" ); -static const mon_flag_str_id mon_flag_QUEEN( "QUEEN" ); -static const mon_flag_str_id mon_flag_REVIVES( "REVIVES" ); -static const mon_flag_str_id mon_flag_REVIVES_HEALTHY( "REVIVES_HEALTHY" ); -static const mon_flag_str_id mon_flag_RIDEABLE_MECH( "RIDEABLE_MECH" ); -static const mon_flag_str_id mon_flag_SEES( "SEES" ); -static const mon_flag_str_id mon_flag_SMELLS( "SMELLS" ); -static const mon_flag_str_id mon_flag_STUN_IMMUNE( "STUN_IMMUNE" ); -static const mon_flag_str_id mon_flag_SUNDEATH( "SUNDEATH" ); -static const mon_flag_str_id mon_flag_SWIMS( "SWIMS" ); -static const mon_flag_str_id mon_flag_VENOM( "VENOM" ); -static const mon_flag_str_id mon_flag_WARM( "WARM" ); -static const mon_flag_str_id mon_flag_WIELDED_WEAPON( "WIELDED_WEAPON" ); - static const species_id species_AMPHIBIAN( "AMPHIBIAN" ); static const species_id species_CYBORG( "CYBORG" ); static const species_id species_FISH( "FISH" ); @@ -228,7 +173,6 @@ static const species_id species_ROBOT( "ROBOT" ); static const species_id species_ZOMBIE( "ZOMBIE" ); static const species_id species_nether_player_hate( "nether_player_hate" ); - static const ter_str_id ter_t_gas_pump( "t_gas_pump" ); static const ter_str_id ter_t_gas_pump_a( "t_gas_pump_a" );