diff --git a/src/npctalk.cpp b/src/npctalk.cpp index d2c4cac144e47..81371ff19eec2 100644 --- a/src/npctalk.cpp +++ b/src/npctalk.cpp @@ -76,7 +76,6 @@ class basecamp; const skill_id skill_speech( "speech" ); -const skill_id skill_barter( "barter" ); const efftype_id effect_allow_sleep( "allow_sleep" ); const efftype_id effect_asked_for_item( "asked_for_item" ); diff --git a/src/player.cpp b/src/player.cpp index eadb543eb64a7..6ac1f894342e8 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -189,51 +189,26 @@ const efftype_id effect_pet( "pet" ); const species_id ROBOT( "ROBOT" ); -static const bionic_id bio_ads( "bio_ads" ); -static const bionic_id bio_advreactor( "bio_advreactor" ); static const bionic_id bio_armor_arms( "bio_armor_arms" ); static const bionic_id bio_armor_eyes( "bio_armor_eyes" ); static const bionic_id bio_armor_head( "bio_armor_head" ); static const bionic_id bio_armor_legs( "bio_armor_legs" ); static const bionic_id bio_armor_torso( "bio_armor_torso" ); -static const bionic_id bio_blaster( "bio_blaster" ); static const bionic_id bio_carbon( "bio_carbon" ); static const bionic_id bio_cloak( "bio_cloak" ); static const bionic_id bio_cqb( "bio_cqb" ); -static const bionic_id bio_dis_acid( "bio_dis_acid" ); -static const bionic_id bio_dis_shock( "bio_dis_shock" ); -static const bionic_id bio_drain( "bio_drain" ); static const bionic_id bio_earplugs( "bio_earplugs" ); static const bionic_id bio_ears( "bio_ears" ); static const bionic_id bio_eye_optic( "bio_eye_optic" ); -static const bionic_id bio_faraday( "bio_faraday" ); -static const bionic_id bio_glowy( "bio_glowy" ); -static const bionic_id bio_geiger( "bio_geiger" ); -static const bionic_id bio_gills( "bio_gills" ); static const bionic_id bio_ground_sonar( "bio_ground_sonar" ); -static const bionic_id bio_itchy( "bio_itchy" ); static const bionic_id bio_jointservo( "bio_jointservo" ); -static const bionic_id bio_laser( "bio_laser" ); -static const bionic_id bio_leaky( "bio_leaky" ); -static const bionic_id bio_lighter( "bio_lighter" ); static const bionic_id bio_membrane( "bio_membrane" ); static const bionic_id bio_memory( "bio_memory" ); -static const bionic_id bio_noise( "bio_noise" ); -static const bionic_id bio_plut_filter( "bio_plut_filter" ); -static const bionic_id bio_power_weakness( "bio_power_weakness" ); -static const bionic_id bio_reactor( "bio_reactor" ); static const bionic_id bio_recycler( "bio_recycler" ); -static const bionic_id bio_shakes( "bio_shakes" ); -static const bionic_id bio_sleepy( "bio_sleepy" ); -static const bionic_id bn_bio_solar( "bn_bio_solar" ); static const bionic_id bio_soporific( "bio_soporific" ); -static const bionic_id bio_spasm( "bio_spasm" ); static const bionic_id bio_speed( "bio_speed" ); static const bionic_id bio_syringe( "bio_syringe" ); -static const bionic_id bio_tools( "bio_tools" ); -static const bionic_id bio_trip( "bio_trip" ); static const bionic_id bio_uncanny_dodge( "bio_uncanny_dodge" ); -static const bionic_id bio_ups( "bio_ups" ); static const bionic_id bio_watch( "bio_watch" ); static const bionic_id bio_synaptic_regen( "bio_synaptic_regen" ); @@ -241,57 +216,38 @@ static const bionic_id bio_synaptic_regen( "bio_synaptic_regen" ); static const bionic_id afs_bio_linguistic_coprocessor( "afs_bio_linguistic_coprocessor" ); static const trait_id trait_ACIDBLOOD( "ACIDBLOOD" ); -static const trait_id trait_ACIDPROOF( "ACIDPROOF" ); -static const trait_id trait_ADDICTIVE( "ADDICTIVE" ); -static const trait_id trait_ADRENALINE( "ADRENALINE" ); -static const trait_id trait_ALBINO( "ALBINO" ); static const trait_id trait_AMPHIBIAN( "AMPHIBIAN" ); static const trait_id trait_ANTENNAE( "ANTENNAE" ); static const trait_id trait_ANTLERS( "ANTLERS" ); -static const trait_id trait_ASTHMA( "ASTHMA" ); -static const trait_id trait_BADBACK( "BADBACK" ); -static const trait_id trait_BARK( "BARK" ); static const trait_id trait_CANNIBAL( "CANNIBAL" ); static const trait_id trait_CENOBITE( "CENOBITE" ); static const trait_id trait_CEPH_EYES( "CEPH_EYES" ); static const trait_id trait_CF_HAIR( "CF_HAIR" ); -static const trait_id trait_CHAOTIC( "CHAOTIC" ); -static const trait_id trait_CHAOTIC_BAD( "CHAOTIC_BAD" ); -static const trait_id trait_CHEMIMBALANCE( "CHEMIMBALANCE" ); static const trait_id trait_CHITIN_FUR( "CHITIN_FUR" ); static const trait_id trait_CHITIN_FUR2( "CHITIN_FUR2" ); static const trait_id trait_CHITIN_FUR3( "CHITIN_FUR3" ); static const trait_id trait_CHLOROMORPH( "CHLOROMORPH" ); static const trait_id trait_CLUMSY( "CLUMSY" ); static const trait_id trait_COLDBLOOD4( "COLDBLOOD4" ); -static const trait_id trait_DEAF( "DEAF" ); static const trait_id trait_DEFT( "DEFT" ); static const trait_id trait_DEBUG_BIONIC_POWER( "DEBUG_BIONIC_POWER" ); static const trait_id trait_DEBUG_CLOAK( "DEBUG_CLOAK" ); static const trait_id trait_DEBUG_HS( "DEBUG_HS" ); static const trait_id trait_DEBUG_LS( "DEBUG_LS" ); static const trait_id trait_DEBUG_NODMG( "DEBUG_NODMG" ); -static const trait_id trait_DEBUG_NOTEMP( "DEBUG_NOTEMP" ); static const trait_id trait_DISIMMUNE( "DISIMMUNE" ); static const trait_id trait_DISRESISTANT( "DISRESISTANT" ); static const trait_id trait_EASYSLEEPER( "EASYSLEEPER" ); static const trait_id trait_EASYSLEEPER2( "EASYSLEEPER2" ); -static const trait_id trait_ELECTRORECEPTORS( "ELECTRORECEPTORS" ); static const trait_id trait_EATHEALTH( "EATHEALTH" ); -static const trait_id trait_FASTHEALER( "FASTHEALER" ); -static const trait_id trait_FASTHEALER2( "FASTHEALER2" ); static const trait_id trait_FASTLEARNER( "FASTLEARNER" ); static const trait_id trait_FASTREADER( "FASTREADER" ); static const trait_id trait_FAT( "FAT" ); static const trait_id trait_FELINE_FUR( "FELINE_FUR" ); -static const trait_id trait_FRESHWATEROSMOSIS( "FRESHWATEROSMOSIS" ); static const trait_id trait_FUR( "FUR" ); -static const trait_id trait_GILLS( "GILLS" ); -static const trait_id trait_GILLS_CEPH( "GILLS_CEPH" ); static const trait_id trait_HATES_BOOKS( "HATES_BOOKS" ); static const trait_id trait_HEAVYSLEEPER( "HEAVYSLEEPER" ); static const trait_id trait_HEAVYSLEEPER2( "HEAVYSLEEPER2" ); -static const trait_id trait_HOLLOW_BONES( "HOLLOW_BONES" ); static const trait_id trait_HOOVES( "HOOVES" ); static const trait_id trait_HORNS_POINTED( "HORNS_POINTED" ); static const trait_id trait_HUGE( "HUGE" ); @@ -299,44 +255,29 @@ static const trait_id trait_HUGE_OK( "HUGE_OK" ); static const trait_id trait_INFIMMUNE( "INFIMMUNE" ); static const trait_id trait_INSOMNIA( "INSOMNIA" ); static const trait_id trait_INT_SLIME( "INT_SLIME" ); -static const trait_id trait_JITTERY( "JITTERY" ); static const trait_id trait_LARGE( "LARGE" ); static const trait_id trait_LARGE_OK( "LARGE_OK" ); -static const trait_id trait_LEAVES( "LEAVES" ); -static const trait_id trait_LEAVES2( "LEAVES2" ); -static const trait_id trait_LEAVES3( "LEAVES3" ); static const trait_id trait_LEG_TENTACLES( "LEG_TENTACLES" ); -static const trait_id trait_LEG_TENT_BRACE( "LEG_TENT_BRACE" ); static const trait_id trait_LIGHTFUR( "LIGHTFUR" ); static const trait_id trait_LIGHTSTEP( "LIGHTSTEP" ); -static const trait_id trait_LIGHT_BONES( "LIGHT_BONES" ); static const trait_id trait_LOVES_BOOKS( "LOVES_BOOKS" ); static const trait_id trait_LUPINE_FUR( "LUPINE_FUR" ); static const trait_id trait_MEMBRANE( "MEMBRANE" ); -static const trait_id trait_MOODSWINGS( "MOODSWINGS" ); static const trait_id trait_MOREPAIN( "MORE_PAIN" ); static const trait_id trait_MOREPAIN2( "MORE_PAIN2" ); static const trait_id trait_MOREPAIN3( "MORE_PAIN3" ); static const trait_id trait_MYOPIC( "MYOPIC" ); -static const trait_id trait_M_BLOSSOMS( "M_BLOSSOMS" ); static const trait_id trait_M_DEPENDENT( "M_DEPENDENT" ); static const trait_id trait_M_IMMUNE( "M_IMMUNE" ); -static const trait_id trait_M_SKIN2( "M_SKIN2" ); static const trait_id trait_M_SKIN3( "M_SKIN3" ); -static const trait_id trait_M_SPORES( "M_SPORES" ); -static const trait_id trait_NARCOLEPTIC( "NARCOLEPTIC" ); static const trait_id trait_NAUSEA( "NAUSEA" ); static const trait_id trait_NOMAD( "NOMAD" ); static const trait_id trait_NOMAD2( "NOMAD2" ); static const trait_id trait_NOMAD3( "NOMAD3" ); -static const trait_id trait_NONADDICTIVE( "NONADDICTIVE" ); static const trait_id trait_NOPAIN( "NOPAIN" ); static const trait_id trait_NO_THIRST( "NO_THIRST" ); static const trait_id trait_PACIFIST( "PACIFIST" ); static const trait_id trait_PADDED_FEET( "PADDED_FEET" ); -static const trait_id trait_PAINREC1( "PAINREC1" ); -static const trait_id trait_PAINREC2( "PAINREC2" ); -static const trait_id trait_PAINREC3( "PAINREC3" ); static const trait_id trait_PAINRESIST( "PAINRESIST" ); static const trait_id trait_PAINRESIST_TROGLO( "PAINRESIST_TROGLO" ); static const trait_id trait_PARAIMMUNE( "PARAIMMUNE" ); @@ -349,55 +290,34 @@ static const trait_id trait_PRED2( "PRED2" ); static const trait_id trait_PRED3( "PRED3" ); static const trait_id trait_PRED4( "PRED4" ); static const trait_id trait_PROF_DICEMASTER( "PROF_DICEMASTER" ); -static const trait_id trait_PROF_FOODP( "PROF_FOODP" ); static const trait_id trait_PROF_SKATER( "PROF_SKATER" ); static const trait_id trait_PSYCHOPATH( "PSYCHOPATH" ); -static const trait_id trait_PYROMANIA( "PYROMANIA" ); -static const trait_id trait_KILLER( "KILLER" ); static const trait_id trait_QUILLS( "QUILLS" ); -static const trait_id trait_RADIOACTIVE1( "RADIOACTIVE1" ); -static const trait_id trait_RADIOACTIVE2( "RADIOACTIVE2" ); -static const trait_id trait_RADIOACTIVE3( "RADIOACTIVE3" ); static const trait_id trait_RADIOGENIC( "RADIOGENIC" ); -static const trait_id trait_REGEN( "REGEN" ); -static const trait_id trait_REGEN_LIZ( "REGEN_LIZ" ); static const trait_id trait_ROOTS2( "ROOTS2" ); static const trait_id trait_ROOTS3( "ROOTS3" ); static const trait_id trait_SAPIOVORE( "SAPIOVORE" ); static const trait_id trait_SAVANT( "SAVANT" ); -static const trait_id trait_SCHIZOPHRENIC( "SCHIZOPHRENIC" ); static const trait_id trait_SEESLEEP( "SEESLEEP" ); static const trait_id trait_SELFAWARE( "SELFAWARE" ); -static const trait_id trait_SHARKTEETH( "SHARKTEETH" ); static const trait_id trait_SHELL2( "SHELL2" ); -static const trait_id trait_SHOUT1( "SHOUT1" ); -static const trait_id trait_SHOUT2( "SHOUT2" ); -static const trait_id trait_SHOUT3( "SHOUT3" ); static const trait_id trait_SLEEK_SCALES( "SLEEK_SCALES" ); static const trait_id trait_SLIMESPAWNER( "SLIMESPAWNER" ); static const trait_id trait_SLIMY( "SLIMY" ); -static const trait_id trait_SLOWHEALER( "SLOWHEALER" ); static const trait_id trait_SLOWLEARNER( "SLOWLEARNER" ); static const trait_id trait_SLOWREADER( "SLOWREADER" ); -static const trait_id trait_SORES( "SORES" ); static const trait_id trait_SPINES( "SPINES" ); static const trait_id trait_SPIRITUAL( "SPIRITUAL" ); static const trait_id trait_SQUEAMISH( "SQUEAMISH" ); static const trait_id trait_STRONGSTOMACH( "STRONGSTOMACH" ); -static const trait_id trait_SUNBURN( "SUNBURN" ); static const trait_id trait_SUNLIGHT_DEPENDENT( "SUNLIGHT_DEPENDENT" ); static const trait_id trait_TAIL_FIN( "TAIL_FIN" ); static const trait_id trait_THORNS( "THORNS" ); static const trait_id trait_THRESH_SPIDER( "THRESH_SPIDER" ); static const trait_id trait_TOUGH_FEET( "TOUGH_FEET" ); static const trait_id trait_TRANSPIRATION( "TRANSPIRATION" ); -static const trait_id trait_TROGLO( "TROGLO" ); -static const trait_id trait_TROGLO2( "TROGLO2" ); -static const trait_id trait_TROGLO3( "TROGLO3" ); -static const trait_id trait_UNSTABLE( "UNSTABLE" ); static const trait_id trait_URSINE_EYE( "URSINE_EYE" ); static const trait_id trait_URSINE_FUR( "URSINE_FUR" ); -static const trait_id trait_VISCOUS( "VISCOUS" ); static const trait_id trait_VOMITOUS( "VOMITOUS" ); static const trait_id trait_WATERSLEEP( "WATERSLEEP" ); static const trait_id trait_WEAKSTOMACH( "WEAKSTOMACH" ); diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp index 8c9f977001821..ed4b85536a96b 100644 --- a/src/savegame_json.cpp +++ b/src/savegame_json.cpp @@ -104,8 +104,6 @@ static const trait_id trait_MYOPIC( "MYOPIC" ); const efftype_id effect_riding( "riding" ); const efftype_id effect_ridden( "ridden" ); -static const matype_id style_kicks( "style_kicks" ); - static const std::array obj_type_name = { { "OBJECT_NONE", "OBJECT_ITEM", "OBJECT_ACTOR", "OBJECT_PLAYER", "OBJECT_NPC", "OBJECT_MONSTER", "OBJECT_VEHICLE", "OBJECT_TRAP", "OBJECT_FIELD", "OBJECT_TERRAIN", "OBJECT_FURNITURE" diff --git a/src/suffer.cpp b/src/suffer.cpp index 3c92a8eff565a..ef617b0c4bae7 100644 --- a/src/suffer.cpp +++ b/src/suffer.cpp @@ -93,12 +93,10 @@ static const bionic_id bio_advreactor( "bio_advreactor" ); static const bionic_id bio_dis_acid( "bio_dis_acid" ); static const bionic_id bio_dis_shock( "bio_dis_shock" ); static const bionic_id bio_drain( "bio_drain" ); -static const bionic_id bio_faraday( "bio_faraday" ); static const bionic_id bio_glowy( "bio_glowy" ); static const bionic_id bio_geiger( "bio_geiger" ); static const bionic_id bio_gills( "bio_gills" ); static const bionic_id bio_itchy( "bio_itchy" ); -static const bionic_id bio_jointservo( "bio_jointservo" ); static const bionic_id bio_leaky( "bio_leaky" ); static const bionic_id bio_noise( "bio_noise" ); static const bionic_id bio_plut_filter( "bio_plut_filter" ); @@ -106,7 +104,6 @@ static const bionic_id bio_power_weakness( "bio_power_weakness" ); static const bionic_id bio_reactor( "bio_reactor" ); static const bionic_id bio_shakes( "bio_shakes" ); static const bionic_id bio_sleepy( "bio_sleepy" ); -static const bionic_id bio_soporific( "bio_soporific" ); static const bionic_id bio_spasm( "bio_spasm" ); static const bionic_id bio_trip( "bio_trip" ); @@ -129,14 +126,10 @@ static const trait_id trait_LEAVES2( "LEAVES2" ); static const trait_id trait_LEAVES3( "LEAVES3" ); static const trait_id trait_MOODSWINGS( "MOODSWINGS" ); static const trait_id trait_M_BLOSSOMS( "M_BLOSSOMS" ); -static const trait_id trait_M_SKIN3( "M_SKIN3" ); static const trait_id trait_M_SPORES( "M_SPORES" ); static const trait_id trait_NARCOLEPTIC( "NARCOLEPTIC" ); static const trait_id trait_NONADDICTIVE( "NONADDICTIVE" ); static const trait_id trait_NOPAIN( "NOPAIN" ); -static const trait_id trait_PAINREC1( "PAINREC1" ); -static const trait_id trait_PAINREC2( "PAINREC2" ); -static const trait_id trait_PAINREC3( "PAINREC3" ); static const trait_id trait_PER_SLIME( "PER_SLIME" ); static const trait_id trait_PYROMANIA( "PYROMANIA" ); static const trait_id trait_RADIOACTIVE1( "RADIOACTIVE1" ); @@ -145,7 +138,6 @@ static const trait_id trait_RADIOACTIVE3( "RADIOACTIVE3" ); static const trait_id trait_RADIOGENIC( "RADIOGENIC" ); static const trait_id trait_REGEN( "REGEN" ); static const trait_id trait_REGEN_LIZ( "REGEN_LIZ" ); -static const trait_id trait_ROOTS2( "ROOTS2" ); static const trait_id trait_ROOTS3( "ROOTS3" ); static const trait_id trait_SCHIZOPHRENIC( "SCHIZOPHRENIC" ); static const trait_id trait_SHARKTEETH( "SHARKTEETH" );