Made global variables static (bionic_id)

CleverRaven · Dec 10, 2019 · 7e6e0a1 · 7e6e0a1
1 parent fc141c8
commit 7e6e0a1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/src/consumption.cpp b/src/consumption.cpp
@@ -56,11 +56,11 @@ const efftype_id effect_fungus( "fungus" );
 
 static const mtype_id mon_player_blob( "mon_player_blob" );
 
-const bionic_id bio_advreactor( "bio_advreactor" );
-const bionic_id bio_digestion( "bio_digestion" );
-const bionic_id bio_furnace( "bio_furnace" );
-const bionic_id bio_reactor( "bio_reactor" );
-const bionic_id bio_taste_blocker( "bio_taste_blocker" );
+static const bionic_id bio_advreactor( "bio_advreactor" );
+static const bionic_id bio_digestion( "bio_digestion" );
+static const bionic_id bio_furnace( "bio_furnace" );
+static const bionic_id bio_reactor( "bio_reactor" );
+static const bionic_id bio_taste_blocker( "bio_taste_blocker" );
 
 const std::vector<std::string> carnivore_blacklist {{
         "ALLERGEN_VEGGY", "ALLERGEN_FRUIT", "ALLERGEN_WHEAT",

diff --git a/src/npcmove.cpp b/src/npcmove.cpp
@@ -90,37 +90,37 @@ static const efftype_id effect_npc_player_looking( "npc_player_still_looking" );
 static const efftype_id effect_ridden( "ridden" );
 
 // power source CBMs
-const bionic_id bio_advreactor( "bio_advreactor" );
-const bionic_id bio_ethanol( "bio_ethanol" );
-const bionic_id bio_furnace( "bio_furnace" );
-const bionic_id bio_reactor( "bio_reactor" );
+static const bionic_id bio_advreactor( "bio_advreactor" );
+static const bionic_id bio_ethanol( "bio_ethanol" );
+static const bionic_id bio_furnace( "bio_furnace" );
+static const bionic_id bio_reactor( "bio_reactor" );
 
 // active defense CBMs - activate when in danger
-const bionic_id bio_ads( "bio_ads" );
-const bionic_id bio_faraday( "bio_faraday" );
-const bionic_id bio_heat_absorb( "bio_heat_absorb" );
-const bionic_id bio_heat_sink( "bio_heatsink" );
-const bionic_id bio_ods( "bio_ods" );
-const bionic_id bio_shock( "bio_shock" );
+static const bionic_id bio_ads( "bio_ads" );
+static const bionic_id bio_faraday( "bio_faraday" );
+static const bionic_id bio_heat_absorb( "bio_heat_absorb" );
+static const bionic_id bio_heat_sink( "bio_heatsink" );
+static const bionic_id bio_ods( "bio_ods" );
+static const bionic_id bio_shock( "bio_shock" );
 
 // special health CBMs - activate as needed
-const bionic_id bio_painkiller( "bio_painkiller" );
-const bionic_id bio_nanobots( "bio_nanobots" );
-const bionic_id bio_radscrubber( "bio_radscrubber" );
-const bionic_id bio_soporific( "bio_soporific" );
+static const bionic_id bio_painkiller( "bio_painkiller" );
+static const bionic_id bio_nanobots( "bio_nanobots" );
+static const bionic_id bio_radscrubber( "bio_radscrubber" );
+static const bionic_id bio_soporific( "bio_soporific" );
 
 // health CBMs - always activate
-const bionic_id bio_leukocyte( "bio_leukocyte" );
-const bionic_id bio_plutfilter( "bio_plutfilter" );
+static const bionic_id bio_leukocyte( "bio_leukocyte" );
+static const bionic_id bio_plutfilter( "bio_plutfilter" );
 
 // melee CBMs - activate for melee combat
-const bionic_id bio_hydraulics( "bio_hydraulics" );
+static const bionic_id bio_hydraulics( "bio_hydraulics" );
 
 // weapon CBMs - activate in combat if they're better than what we have
-const bionic_id bio_lightning( "bio_chain_lightning" );
-const bionic_id bio_laser( "bio_laser" );
-const bionic_id bio_blade( "bio_blade" );
-const bionic_id bio_claws( "bio_claws" );
+static const bionic_id bio_lightning( "bio_chain_lightning" );
+static const bionic_id bio_laser( "bio_laser" );
+static const bionic_id bio_blade( "bio_blade" );
+static const bionic_id bio_claws( "bio_claws" );
 
 const ammotype reactor_slurry( "reactor_slurry" );
 const ammotype plutonium( "plutonium" );