From 9cdc9494088a092d8a91094443457fa5916524a1 Mon Sep 17 00:00:00 2001 From: ZhilkinSerg Date: Wed, 11 Dec 2019 00:05:49 +0300 Subject: [PATCH] Made global variables static (mtype_id) --- src/computer.cpp | 6 +- src/consumption.cpp | 2 +- src/fungal_effects.cpp | 4 +- src/game.cpp | 2 +- src/iexamine.cpp | 12 ++-- src/iuse.cpp | 26 ++++---- src/map.cpp | 2 +- src/mapgen_functions.cpp | 20 +++--- src/mission_start.cpp | 20 +++--- src/monattack.cpp | 68 +++++++++---------- src/mondeath.cpp | 30 ++++----- src/monster.cpp | 108 +++++++++++++++---------------- src/npctalk_funcs.cpp | 6 +- src/player.cpp | 4 +- src/player_hardcoded_effects.cpp | 2 +- src/timed_event.cpp | 18 +++--- src/trapfunc.cpp | 6 +- src/tutorial.cpp | 2 +- 18 files changed, 169 insertions(+), 169 deletions(-) diff --git a/src/computer.cpp b/src/computer.cpp index cc0164dfab5d3..ad0209f45d583 100644 --- a/src/computer.cpp +++ b/src/computer.cpp @@ -54,9 +54,9 @@ #include "colony.h" #include "point.h" -const mtype_id mon_manhack( "mon_manhack" ); -const mtype_id mon_secubot( "mon_secubot" ); -const mtype_id mon_turret_rifle( "mon_turret_rifle" ); +static const mtype_id mon_manhack( "mon_manhack" ); +static const mtype_id mon_secubot( "mon_secubot" ); +static const mtype_id mon_turret_rifle( "mon_turret_rifle" ); const skill_id skill_computer( "computer" ); diff --git a/src/consumption.cpp b/src/consumption.cpp index a9e9b9a892060..6a576370282d6 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -54,7 +54,7 @@ const efftype_id effect_common_cold( "common_cold" ); const efftype_id effect_flu( "flu" ); const efftype_id effect_fungus( "fungus" ); -const mtype_id mon_player_blob( "mon_player_blob" ); +static const mtype_id mon_player_blob( "mon_player_blob" ); const bionic_id bio_advreactor( "bio_advreactor" ); const bionic_id bio_digestion( "bio_digestion" ); diff --git a/src/fungal_effects.cpp b/src/fungal_effects.cpp index ce8e05d6b8e7f..8b821b05e47b3 100644 --- a/src/fungal_effects.cpp +++ b/src/fungal_effects.cpp @@ -29,8 +29,8 @@ #include "point.h" #include "string_formatter.h" -const mtype_id mon_fungal_blossom( "mon_fungal_blossom" ); -const mtype_id mon_spore( "mon_spore" ); +static const mtype_id mon_fungal_blossom( "mon_fungal_blossom" ); +static const mtype_id mon_spore( "mon_spore" ); const efftype_id effect_stunned( "stunned" ); const efftype_id effect_spores( "spores" ); diff --git a/src/game.cpp b/src/game.cpp index 259135fedf63f..91340666bf005 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -168,7 +168,7 @@ static constexpr int DANGEROUS_PROXIMITY = 5; /** Will be set to true when running unit tests */ bool test_mode = false; -const mtype_id mon_manhack( "mon_manhack" ); +static const mtype_id mon_manhack( "mon_manhack" ); const skill_id skill_melee( "melee" ); const skill_id skill_dodge( "dodge" ); diff --git a/src/iexamine.cpp b/src/iexamine.cpp index 9ef5ffe1526d0..e12d0d35b76f0 100644 --- a/src/iexamine.cpp +++ b/src/iexamine.cpp @@ -88,12 +88,12 @@ #include "magic_teleporter_list.h" #include "point.h" -const mtype_id mon_dark_wyrm( "mon_dark_wyrm" ); -const mtype_id mon_fungal_blossom( "mon_fungal_blossom" ); -const mtype_id mon_spider_web_s( "mon_spider_web_s" ); -const mtype_id mon_spider_widow_giant_s( "mon_spider_widow_giant_s" ); -const mtype_id mon_spider_cellar_giant_s( "mon_spider_cellar_giant_s" ); -const mtype_id mon_turret_rifle( "mon_turret_rifle" ); +static const mtype_id mon_dark_wyrm( "mon_dark_wyrm" ); +static const mtype_id mon_fungal_blossom( "mon_fungal_blossom" ); +static const mtype_id mon_spider_web_s( "mon_spider_web_s" ); +static const mtype_id mon_spider_widow_giant_s( "mon_spider_widow_giant_s" ); +static const mtype_id mon_spider_cellar_giant_s( "mon_spider_cellar_giant_s" ); +static const mtype_id mon_turret_rifle( "mon_turret_rifle" ); const skill_id skill_computer( "computer" ); const skill_id skill_fabrication( "fabrication" ); diff --git a/src/iuse.cpp b/src/iuse.cpp index 8214c06454f8a..4128dcc7f9266 100644 --- a/src/iuse.cpp +++ b/src/iuse.cpp @@ -105,19 +105,19 @@ #include "iuse_software.h" -const mtype_id mon_bee( "mon_bee" ); -const mtype_id mon_blob( "mon_blob" ); -const mtype_id mon_cat( "mon_cat" ); -const mtype_id mon_hologram( "mon_hologram" ); -const mtype_id mon_dog( "mon_dog" ); -const mtype_id mon_dog_thing( "mon_dog_thing" ); -const mtype_id mon_fly( "mon_fly" ); -const mtype_id mon_hallu_multicooker( "mon_hallu_multicooker" ); -const mtype_id mon_shadow( "mon_shadow" ); -const mtype_id mon_spore( "mon_spore" ); -const mtype_id mon_vortex( "mon_vortex" ); -const mtype_id mon_wasp( "mon_wasp" ); -const mtype_id mon_cow( "mon_cow" ); +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" ); const skill_id skill_firstaid( "firstaid" ); const skill_id skill_survival( "survival" ); diff --git a/src/map.cpp b/src/map.cpp index cb400a6295a27..b34f080e4661c 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -83,7 +83,7 @@ #include "construction.h" #include "flat_set.h" -const mtype_id mon_zombie( "mon_zombie" ); +static const mtype_id mon_zombie( "mon_zombie" ); const skill_id skill_traps( "traps" ); diff --git a/src/mapgen_functions.cpp b/src/mapgen_functions.cpp index 64625cce2d603..aa52db76e3824 100644 --- a/src/mapgen_functions.cpp +++ b/src/mapgen_functions.cpp @@ -41,16 +41,16 @@ class npc_template; #define dbg(x) DebugLog((x),D_MAP_GEN) << __FILE__ << ":" << __LINE__ << ": " -const mtype_id mon_ant_larva( "mon_ant_larva" ); -const mtype_id mon_ant_queen( "mon_ant_queen" ); -const mtype_id mon_bat( "mon_bat" ); -const mtype_id mon_bee( "mon_bee" ); -const mtype_id mon_beekeeper( "mon_beekeeper" ); -const mtype_id mon_rat_king( "mon_rat_king" ); -const mtype_id mon_sewer_rat( "mon_sewer_rat" ); -const mtype_id mon_spider_widow_giant( "mon_spider_widow_giant" ); -const mtype_id mon_spider_cellar_giant( "mon_spider_cellar_giant" ); -const mtype_id mon_zombie_jackson( "mon_zombie_jackson" ); +static const mtype_id mon_ant_larva( "mon_ant_larva" ); +static const mtype_id mon_ant_queen( "mon_ant_queen" ); +static const mtype_id mon_bat( "mon_bat" ); +static const mtype_id mon_bee( "mon_bee" ); +static const mtype_id mon_beekeeper( "mon_beekeeper" ); +static const mtype_id mon_rat_king( "mon_rat_king" ); +static const mtype_id mon_sewer_rat( "mon_sewer_rat" ); +static const mtype_id mon_spider_widow_giant( "mon_spider_widow_giant" ); +static const mtype_id mon_spider_cellar_giant( "mon_spider_cellar_giant" ); +static const mtype_id mon_zombie_jackson( "mon_zombie_jackson" ); tripoint rotate_point( const tripoint &p, int rotations ) { diff --git a/src/mission_start.cpp b/src/mission_start.cpp index 616b657b14b7b..8e00eebc136d6 100644 --- a/src/mission_start.cpp +++ b/src/mission_start.cpp @@ -26,16 +26,16 @@ #include "optional.h" #include "rng.h" -const mtype_id mon_charred_nightmare( "mon_charred_nightmare" ); -const mtype_id mon_dog( "mon_dog" ); -const mtype_id mon_jabberwock( "mon_jabberwock" ); -const mtype_id mon_zombie( "mon_zombie" ); -const mtype_id mon_zombie_brute( "mon_zombie_brute" ); -const mtype_id mon_zombie_dog( "mon_zombie_dog" ); -const mtype_id mon_zombie_electric( "mon_zombie_electric" ); -const mtype_id mon_zombie_hulk( "mon_zombie_hulk" ); -const mtype_id mon_zombie_master( "mon_zombie_master" ); -const mtype_id mon_zombie_necro( "mon_zombie_necro" ); +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" ); const efftype_id effect_infection( "infection" ); diff --git a/src/monattack.cpp b/src/monattack.cpp index ba28f6ce15ce4..5038028846bdc 100644 --- a/src/monattack.cpp +++ b/src/monattack.cpp @@ -72,40 +72,40 @@ #include "point.h" #include "units.h" -const mtype_id mon_ant( "mon_ant" ); -const mtype_id mon_ant_acid( "mon_ant_acid" ); -const mtype_id mon_ant_acid_larva( "mon_ant_acid_larva" ); -const mtype_id mon_ant_acid_soldier( "mon_ant_acid_soldier" ); -const mtype_id mon_ant_acid_queen( "mon_ant_acid_queen" ); -const mtype_id mon_ant_larva( "mon_ant_larva" ); -const mtype_id mon_ant_soldier( "mon_ant_soldier" ); -const mtype_id mon_biollante( "mon_biollante" ); -const mtype_id mon_blob( "mon_blob" ); -const mtype_id mon_blob_brain( "mon_blob_brain" ); -const mtype_id mon_blob_large( "mon_blob_large" ); -const mtype_id mon_blob_small( "mon_blob_small" ); -const mtype_id mon_breather( "mon_breather" ); -const mtype_id mon_breather_hub( "mon_breather_hub" ); -const mtype_id mon_creeper_hub( "mon_creeper_hub" ); -const mtype_id mon_creeper_vine( "mon_creeper_vine" ); -const mtype_id mon_dermatik( "mon_dermatik" ); -const mtype_id mon_defective_robot_nurse( "mon_nursebot_defective" ); -const mtype_id mon_fungal_hedgerow( "mon_fungal_hedgerow" ); -const mtype_id mon_fungaloid( "mon_fungaloid" ); -const mtype_id mon_fungaloid_young( "mon_fungaloid_young" ); -const mtype_id mon_fungal_tendril( "mon_fungal_tendril" ); -const mtype_id mon_fungal_wall( "mon_fungal_wall" ); -const mtype_id mon_headless_dog_thing( "mon_headless_dog_thing" ); -const mtype_id mon_manhack( "mon_manhack" ); -const mtype_id mon_shadow( "mon_shadow" ); -const mtype_id mon_hound_tindalos_afterimage( "mon_hound_tindalos_afterimage" ); -const mtype_id mon_triffid( "mon_triffid" ); -const mtype_id mon_zombie_gasbag_impaler( "mon_zombie_gasbag_impaler" ); -const mtype_id mon_zombie_gasbag_crawler( "mon_zombie_gasbag_crawler" ); -const mtype_id mon_turret_searchlight( "mon_turret_searchlight" ); -const mtype_id mon_zombie_dancer( "mon_zombie_dancer" ); -const mtype_id mon_zombie_jackson( "mon_zombie_jackson" ); -const mtype_id mon_zombie_skeltal_minion( "mon_zombie_skeltal_minion" ); +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" ); +static const mtype_id mon_blob_large( "mon_blob_large" ); +static const mtype_id mon_blob_small( "mon_blob_small" ); +static const mtype_id mon_breather( "mon_breather" ); +static const mtype_id mon_breather_hub( "mon_breather_hub" ); +static const mtype_id mon_creeper_hub( "mon_creeper_hub" ); +static const mtype_id mon_creeper_vine( "mon_creeper_vine" ); +static const mtype_id mon_dermatik( "mon_dermatik" ); +static const mtype_id mon_defective_robot_nurse( "mon_nursebot_defective" ); +static const mtype_id mon_fungal_hedgerow( "mon_fungal_hedgerow" ); +static const mtype_id mon_fungaloid( "mon_fungaloid" ); +static const mtype_id mon_fungaloid_young( "mon_fungaloid_young" ); +static const mtype_id mon_fungal_tendril( "mon_fungal_tendril" ); +static const mtype_id mon_fungal_wall( "mon_fungal_wall" ); +static const mtype_id mon_headless_dog_thing( "mon_headless_dog_thing" ); +static const mtype_id mon_manhack( "mon_manhack" ); +static const mtype_id mon_shadow( "mon_shadow" ); +static const mtype_id mon_hound_tindalos_afterimage( "mon_hound_tindalos_afterimage" ); +static const mtype_id mon_triffid( "mon_triffid" ); +static const mtype_id mon_zombie_gasbag_impaler( "mon_zombie_gasbag_impaler" ); +static const mtype_id mon_zombie_gasbag_crawler( "mon_zombie_gasbag_crawler" ); +static const mtype_id mon_turret_searchlight( "mon_turret_searchlight" ); +static const mtype_id mon_zombie_dancer( "mon_zombie_dancer" ); +static const mtype_id mon_zombie_jackson( "mon_zombie_jackson" ); +static const mtype_id mon_zombie_skeltal_minion( "mon_zombie_skeltal_minion" ); const skill_id skill_melee( "melee" ); const skill_id skill_gun( "gun" ); diff --git a/src/mondeath.cpp b/src/mondeath.cpp index 1b528c38e117b..53c3a9de828b1 100644 --- a/src/mondeath.cpp +++ b/src/mondeath.cpp @@ -48,21 +48,21 @@ #include "point.h" #include "mattack_actors.h" -const mtype_id mon_blob( "mon_blob" ); -const mtype_id mon_blob_brain( "mon_blob_brain" ); -const mtype_id mon_blob_small( "mon_blob_small" ); -const mtype_id mon_breather( "mon_breather" ); -const mtype_id mon_breather_hub( "mon_breather_hub" ); -const mtype_id mon_creeper_hub( "mon_creeper_hub" ); -const mtype_id mon_creeper_vine( "mon_creeper_vine" ); -const mtype_id mon_halfworm( "mon_halfworm" ); -const mtype_id mon_sewer_rat( "mon_sewer_rat" ); -const mtype_id mon_thing( "mon_thing" ); -const mtype_id mon_zombie_dancer( "mon_zombie_dancer" ); -const mtype_id mon_zombie_hulk( "mon_zombie_hulk" ); -const mtype_id mon_giant_cockroach( "mon_giant_cockroach" ); -const mtype_id mon_giant_cockroach_nymph( "mon_giant_cockroach_nymph" ); -const mtype_id mon_pregnant_giant_cockroach( "mon_pregnant_giant_cockroach" ); +static const mtype_id mon_blob( "mon_blob" ); +static const mtype_id mon_blob_brain( "mon_blob_brain" ); +static const mtype_id mon_blob_small( "mon_blob_small" ); +static const mtype_id mon_breather( "mon_breather" ); +static const mtype_id mon_breather_hub( "mon_breather_hub" ); +static const mtype_id mon_creeper_hub( "mon_creeper_hub" ); +static const mtype_id mon_creeper_vine( "mon_creeper_vine" ); +static const mtype_id mon_halfworm( "mon_halfworm" ); +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" ); const species_id ZOMBIE( "ZOMBIE" ); const species_id BLOB( "BLOB" ); diff --git a/src/monster.cpp b/src/monster.cpp index 92e4fbc974aa9..8ed81384bc68c 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -62,60 +62,60 @@ struct pathfinding_settings; // The rough formula is 2^(-x), e.g. for x = 5 it's 0.03125 (~ 3%). #define UPGRADE_MAX_ITERS 5 -const mtype_id mon_ant( "mon_ant" ); -const mtype_id mon_ant_fungus( "mon_ant_fungus" ); -const mtype_id mon_ant_queen( "mon_ant_queen" ); -const mtype_id mon_ant_soldier( "mon_ant_soldier" ); -const mtype_id mon_bee( "mon_bee" ); -const mtype_id mon_beekeeper( "mon_beekeeper" ); -const mtype_id mon_boomer( "mon_boomer" ); -const mtype_id mon_boomer_huge( "mon_boomer_huge" ); -const mtype_id mon_boomer_fungus( "mon_boomer_fungus" ); -const mtype_id mon_fungaloid( "mon_fungaloid" ); -const mtype_id mon_triffid( "mon_triffid" ); -const mtype_id mon_triffid_queen( "mon_triffid_queen" ); -const mtype_id mon_triffid_young( "mon_triffid_young" ); -const mtype_id mon_zombie( "mon_zombie" ); -const mtype_id mon_zombie_bio_op( "mon_zombie_bio_op" ); -const mtype_id mon_zombie_brute( "mon_zombie_brute" ); -const mtype_id mon_zombie_brute_shocker( "mon_zombie_brute_shocker" ); -const mtype_id mon_zombie_child( "mon_zombie_child" ); -const mtype_id mon_zombie_cop( "mon_zombie_cop" ); -const mtype_id mon_zombie_electric( "mon_zombie_electric" ); -const mtype_id mon_zombie_fat( "mon_zombie_fat" ); -const mtype_id mon_zombie_fireman( "mon_zombie_fireman" ); -const mtype_id mon_zombie_fungus( "mon_zombie_fungus" ); -const mtype_id mon_zombie_gasbag( "mon_zombie_gasbag" ); -const mtype_id mon_zombie_gasbag_fungus( "mon_zombie_gasbag_fungus" ); -const mtype_id mon_zombie_grabber( "mon_zombie_grabber" ); -const mtype_id mon_zombie_hazmat( "mon_zombie_hazmat" ); -const mtype_id mon_zombie_hulk( "mon_zombie_hulk" ); -const mtype_id mon_skeleton_hulk( "mon_skeleton_hulk" ); -const mtype_id mon_skeleton_hulk_fungus( "mon_skeleton_hulk_fungus" ); -const mtype_id mon_skeleton_brute( "mon_skeleton_brute" ); -const mtype_id mon_zombie_hunter( "mon_zombie_hunter" ); -const mtype_id mon_zombie_master( "mon_zombie_master" ); -const mtype_id mon_zombie_necro( "mon_zombie_necro" ); -const mtype_id mon_zombie_rot( "mon_zombie_rot" ); -const mtype_id mon_zombie_scientist( "mon_zombie_scientist" ); -const mtype_id mon_zombie_scorched( "mon_zombie_scorched" ); -const mtype_id mon_zombie_shrieker( "mon_zombie_shrieker" ); -const mtype_id mon_zombie_smoker( "mon_zombie_smoker" ); -const mtype_id mon_zombie_smoker_fungus( "mon_zombie_smoker_fungus" ); -const mtype_id mon_zombie_soldier( "mon_zombie_soldier" ); -const mtype_id mon_zombie_spitter( "mon_zombie_spitter" ); -const mtype_id mon_zombie_survivor( "mon_zombie_survivor" ); -const mtype_id mon_zombie_swimmer( "mon_zombie_swimmer" ); -const mtype_id mon_zombie_technician( "mon_zombie_technician" ); -const mtype_id mon_zombie_tough( "mon_zombie_tough" ); -const mtype_id mon_zombie_child_fungus( "mon_zombie_child_fungus" ); -const mtype_id mon_zombie_anklebiter( "mon_zombie_anklebiter" ); -const mtype_id mon_zombie_creepy( "mon_zombie_creepy" ); -const mtype_id mon_zombie_sproglodyte( "mon_zombie_sproglodyte" ); -const mtype_id mon_zombie_shriekling( "mon_zombie_shriekling" ); -const mtype_id mon_zombie_snotgobbler( "mon_zombie_snotgobbler" ); -const mtype_id mon_zombie_waif( "mon_zombie_waif" ); -const mtype_id mon_spider_fungus( "mon_spider_fungus" ); +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" ); +static const mtype_id mon_boomer_fungus( "mon_boomer_fungus" ); +static const mtype_id mon_fungaloid( "mon_fungaloid" ); +static const mtype_id mon_triffid( "mon_triffid" ); +static const mtype_id mon_triffid_queen( "mon_triffid_queen" ); +static const mtype_id mon_triffid_young( "mon_triffid_young" ); +static const mtype_id mon_zombie( "mon_zombie" ); +static const mtype_id mon_zombie_bio_op( "mon_zombie_bio_op" ); +static const mtype_id mon_zombie_brute( "mon_zombie_brute" ); +static const mtype_id mon_zombie_brute_shocker( "mon_zombie_brute_shocker" ); +static const mtype_id mon_zombie_child( "mon_zombie_child" ); +static const mtype_id mon_zombie_cop( "mon_zombie_cop" ); +static const mtype_id mon_zombie_electric( "mon_zombie_electric" ); +static const mtype_id mon_zombie_fat( "mon_zombie_fat" ); +static const mtype_id mon_zombie_fireman( "mon_zombie_fireman" ); +static const mtype_id mon_zombie_fungus( "mon_zombie_fungus" ); +static const mtype_id mon_zombie_gasbag( "mon_zombie_gasbag" ); +static const mtype_id mon_zombie_gasbag_fungus( "mon_zombie_gasbag_fungus" ); +static const mtype_id mon_zombie_grabber( "mon_zombie_grabber" ); +static const mtype_id mon_zombie_hazmat( "mon_zombie_hazmat" ); +static const mtype_id mon_zombie_hulk( "mon_zombie_hulk" ); +static const mtype_id mon_skeleton_hulk( "mon_skeleton_hulk" ); +static const mtype_id mon_skeleton_hulk_fungus( "mon_skeleton_hulk_fungus" ); +static const mtype_id mon_skeleton_brute( "mon_skeleton_brute" ); +static const mtype_id mon_zombie_hunter( "mon_zombie_hunter" ); +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" ); +static const mtype_id mon_zombie_soldier( "mon_zombie_soldier" ); +static const mtype_id mon_zombie_spitter( "mon_zombie_spitter" ); +static const mtype_id mon_zombie_survivor( "mon_zombie_survivor" ); +static const mtype_id mon_zombie_swimmer( "mon_zombie_swimmer" ); +static const mtype_id mon_zombie_technician( "mon_zombie_technician" ); +static const mtype_id mon_zombie_tough( "mon_zombie_tough" ); +static const mtype_id mon_zombie_child_fungus( "mon_zombie_child_fungus" ); +static const mtype_id mon_zombie_anklebiter( "mon_zombie_anklebiter" ); +static const mtype_id mon_zombie_creepy( "mon_zombie_creepy" ); +static const mtype_id mon_zombie_sproglodyte( "mon_zombie_sproglodyte" ); +static const mtype_id mon_zombie_shriekling( "mon_zombie_shriekling" ); +static const mtype_id mon_zombie_snotgobbler( "mon_zombie_snotgobbler" ); +static const mtype_id mon_zombie_waif( "mon_zombie_waif" ); +static const mtype_id mon_spider_fungus( "mon_spider_fungus" ); const species_id ZOMBIE( "ZOMBIE" ); const species_id FUNGUS( "FUNGUS" ); diff --git a/src/npctalk_funcs.cpp b/src/npctalk_funcs.cpp index 98c1707d52d29..237095bc39120 100644 --- a/src/npctalk_funcs.cpp +++ b/src/npctalk_funcs.cpp @@ -72,9 +72,9 @@ const efftype_id effect_riding( "riding" ); const efftype_id effect_ridden( "ridden" ); const efftype_id effect_saddled( "monster_saddled" ); -const mtype_id mon_horse( "mon_horse" ); -const mtype_id mon_cow( "mon_cow" ); -const mtype_id mon_chicken( "mon_chicken" ); +static const mtype_id mon_horse( "mon_horse" ); +static const mtype_id mon_cow( "mon_cow" ); +static const mtype_id mon_chicken( "mon_chicken" ); void spawn_animal( npc &p, const mtype_id &mon ); diff --git a/src/player.cpp b/src/player.cpp index 7104ca09c3315..441068f17bf25 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -102,8 +102,8 @@ const double MAX_RECOIL = 3000; -const mtype_id mon_player_blob( "mon_player_blob" ); -const mtype_id mon_shadow_snake( "mon_shadow_snake" ); +static const mtype_id mon_player_blob( "mon_player_blob" ); +static const mtype_id mon_shadow_snake( "mon_shadow_snake" ); const skill_id skill_dodge( "dodge" ); const skill_id skill_gun( "gun" ); diff --git a/src/player_hardcoded_effects.cpp b/src/player_hardcoded_effects.cpp index ac86ee30cd9d7..f322946034f17 100644 --- a/src/player_hardcoded_effects.cpp +++ b/src/player_hardcoded_effects.cpp @@ -38,7 +38,7 @@ #include #include -const mtype_id mon_dermatik_larva( "mon_dermatik_larva" ); +static const mtype_id mon_dermatik_larva( "mon_dermatik_larva" ); const efftype_id effect_adrenaline( "adrenaline" ); const efftype_id effect_alarm_clock( "alarm_clock" ); diff --git a/src/timed_event.cpp b/src/timed_event.cpp index 34b0b2853222e..7c2c685a27f6d 100644 --- a/src/timed_event.cpp +++ b/src/timed_event.cpp @@ -24,15 +24,15 @@ #include "type_id.h" #include "enums.h" -const mtype_id mon_amigara_horror( "mon_amigara_horror" ); -const mtype_id mon_copbot( "mon_copbot" ); -const mtype_id mon_dark_wyrm( "mon_dark_wyrm" ); -const mtype_id mon_dermatik( "mon_dermatik" ); -const mtype_id mon_eyebot( "mon_eyebot" ); -const mtype_id mon_riotbot( "mon_riotbot" ); -const mtype_id mon_sewer_snake( "mon_sewer_snake" ); -const mtype_id mon_spider_widow_giant( "mon_spider_widow_giant" ); -const mtype_id mon_spider_cellar_giant( "mon_spider_cellar_giant" ); +static const mtype_id mon_amigara_horror( "mon_amigara_horror" ); +static const mtype_id mon_copbot( "mon_copbot" ); +static const mtype_id mon_dark_wyrm( "mon_dark_wyrm" ); +static const mtype_id mon_dermatik( "mon_dermatik" ); +static const mtype_id mon_eyebot( "mon_eyebot" ); +static const mtype_id mon_riotbot( "mon_riotbot" ); +static const mtype_id mon_sewer_snake( "mon_sewer_snake" ); +static const mtype_id mon_spider_widow_giant( "mon_spider_widow_giant" ); +static const mtype_id mon_spider_cellar_giant( "mon_spider_cellar_giant" ); timed_event::timed_event( timed_event_type e_t, const time_point &w, int f_id, tripoint p ) : type( e_t ) diff --git a/src/trapfunc.cpp b/src/trapfunc.cpp index c520ac701ab99..22daa283f8b66 100644 --- a/src/trapfunc.cpp +++ b/src/trapfunc.cpp @@ -34,9 +34,9 @@ #include "point.h" #include "teleport.h" -const mtype_id mon_blob( "mon_blob" ); -const mtype_id mon_shadow( "mon_shadow" ); -const mtype_id mon_shadow_snake( "mon_shadow_snake" ); +static const mtype_id mon_blob( "mon_blob" ); +static const mtype_id mon_shadow( "mon_shadow" ); +static const mtype_id mon_shadow_snake( "mon_shadow_snake" ); const species_id ROBOT( "ROBOT" ); diff --git a/src/tutorial.cpp b/src/tutorial.cpp index d9f19e5a95ee6..53e9ab123b9a0 100644 --- a/src/tutorial.cpp +++ b/src/tutorial.cpp @@ -34,7 +34,7 @@ #include "point.h" #include "weather.h" -const mtype_id mon_zombie( "mon_zombie" ); +static const mtype_id mon_zombie( "mon_zombie" ); static std::vector tut_text;