Skip to content

Commit

Permalink
Made global variables static (mtype_id)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg committed Dec 10, 2019
1 parent e8bfb5e commit 9cdc949
Show file tree
Hide file tree
Showing 18 changed files with 169 additions and 169 deletions.
6 changes: 3 additions & 3 deletions src/computer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" );

Expand Down
2 changes: 1 addition & 1 deletion src/consumption.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
4 changes: 2 additions & 2 deletions src/fungal_effects.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
2 changes: 1 addition & 1 deletion src/game.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
12 changes: 6 additions & 6 deletions src/iexamine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
26 changes: 13 additions & 13 deletions src/iuse.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
2 changes: 1 addition & 1 deletion src/map.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" );

Expand Down
20 changes: 10 additions & 10 deletions src/mapgen_functions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down
20 changes: 10 additions & 10 deletions src/mission_start.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" );

Expand Down
68 changes: 34 additions & 34 deletions src/monattack.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
30 changes: 15 additions & 15 deletions src/mondeath.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
108 changes: 54 additions & 54 deletions src/monster.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
6 changes: 3 additions & 3 deletions src/npctalk_funcs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down
Loading

0 comments on commit 9cdc949

Please sign in to comment.