Skip to content

Commit fb70cbb

Browse files
Fris0umanFris0uman
committed
fix ids to appease clang
1 parent 7c4e71e commit fb70cbb

File tree

14 files changed

+177
-177
lines changed

14 files changed

+177
-177
lines changed

‎src/ballistics.cpp‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,23 @@
3838
#include "units.h"
3939
#include "vpart_position.h"
4040

41-
static const ammo_effect_str_id ammo_effect_id_ACT_ON_RANGED_HIT( "ACT_ON_RANGED_HIT" );
42-
static const ammo_effect_str_id ammo_effect_id_BOUNCE( "BOUNCE" );
43-
static const ammo_effect_str_id ammo_effect_id_BURST( "BURST" );
44-
static const ammo_effect_str_id ammo_effect_id_DRAW_AS_LINE( "DRAW_AS_LINE" );
45-
static const ammo_effect_str_id ammo_effect_id_HEAVY_HIT( "HEAVY_HIT" );
46-
static const ammo_effect_str_id ammo_effect_id_JET( "JET" );
47-
static const ammo_effect_str_id ammo_effect_id_MUZZLE_SMOKE( "MUZZLE_SMOKE" );
48-
static const ammo_effect_str_id ammo_effect_id_NO_EMBED( "NO_EMBED" );
49-
static const ammo_effect_str_id ammo_effect_id_NO_ITEM_DAMAGE( "NO_ITEM_DAMAGE" );
50-
static const ammo_effect_str_id ammo_effect_id_NO_OVERSHOOT( "NO_OVERSHOOT" );
51-
static const ammo_effect_str_id ammo_effect_id_NO_PENETRATE_OBSTACLES( "NO_PENETRATE_OBSTACLES" );
52-
static const ammo_effect_str_id ammo_effect_id_NULL_SOURCE( "NULL_SOURCE" );
53-
static const ammo_effect_str_id ammo_effect_id_SHATTER_SELF( "SHATTER_SELF" );
54-
static const ammo_effect_str_id ammo_effect_id_STREAM( "STREAM" );
55-
static const ammo_effect_str_id ammo_effect_id_STREAM_BIG( "STREAM_BIG" );
56-
static const ammo_effect_str_id ammo_effect_id_STREAM_TINY( "STREAM_TINY" );
57-
static const ammo_effect_str_id ammo_effect_id_TANGLE( "TANGLE" );
41+
static const ammo_effect_str_id ammo_effect_ACT_ON_RANGED_HIT( "ACT_ON_RANGED_HIT" );
42+
static const ammo_effect_str_id ammo_effect_BOUNCE( "BOUNCE" );
43+
static const ammo_effect_str_id ammo_effect_BURST( "BURST" );
44+
static const ammo_effect_str_id ammo_effect_DRAW_AS_LINE( "DRAW_AS_LINE" );
45+
static const ammo_effect_str_id ammo_effect_HEAVY_HIT( "HEAVY_HIT" );
46+
static const ammo_effect_str_id ammo_effect_JET( "JET" );
47+
static const ammo_effect_str_id ammo_effect_MUZZLE_SMOKE( "MUZZLE_SMOKE" );
48+
static const ammo_effect_str_id ammo_effect_NO_EMBED( "NO_EMBED" );
49+
static const ammo_effect_str_id ammo_effect_NO_ITEM_DAMAGE( "NO_ITEM_DAMAGE" );
50+
static const ammo_effect_str_id ammo_effect_NO_OVERSHOOT( "NO_OVERSHOOT" );
51+
static const ammo_effect_str_id ammo_effect_NO_PENETRATE_OBSTACLES( "NO_PENETRATE_OBSTACLES" );
52+
static const ammo_effect_str_id ammo_effect_NULL_SOURCE( "NULL_SOURCE" );
53+
static const ammo_effect_str_id ammo_effect_SHATTER_SELF( "SHATTER_SELF" );
54+
static const ammo_effect_str_id ammo_effect_STREAM( "STREAM" );
55+
static const ammo_effect_str_id ammo_effect_STREAM_BIG( "STREAM_BIG" );
56+
static const ammo_effect_str_id ammo_effect_STREAM_TINY( "STREAM_TINY" );
57+
static const ammo_effect_str_id ammo_effect_TANGLE( "TANGLE" );
5858

5959
static const efftype_id effect_bounced( "bounced" );
6060

@@ -73,7 +73,7 @@ static void drop_or_embed_projectile( const dealt_projectile_attack &attack )
7373

7474
const tripoint &pt = attack.end_point;
7575

76-
if( effects.count( ammo_effect_id_SHATTER_SELF ) ) {
76+
if( effects.count( ammo_effect_SHATTER_SELF ) ) {
7777
// Drop the contents, not the thrown item
7878
add_msg_if_player_sees( pt, _( "The %s shatters!" ), drop_item.tname() );
7979

@@ -102,7 +102,7 @@ static void drop_or_embed_projectile( const dealt_projectile_attack &attack )
102102
return;
103103
}
104104

105-
if( effects.count( ammo_effect_id_BURST ) ) {
105+
if( effects.count( ammo_effect_BURST ) ) {
106106
// Drop the contents, not the thrown item
107107
add_msg_if_player_sees( pt, _( "The %s bursts!" ), drop_item.tname() );
108108

@@ -121,8 +121,8 @@ static void drop_or_embed_projectile( const dealt_projectile_attack &attack )
121121
// We can only embed in monsters
122122
bool mon_there = mon != nullptr && !mon->is_dead_state();
123123
// And if we actually want to embed
124-
bool embed = mon_there && effects.count( ammo_effect_id_NO_EMBED ) == 0 &&
125-
effects.count( ammo_effect_id_TANGLE ) == 0;
124+
bool embed = mon_there && effects.count( ammo_effect_NO_EMBED ) == 0 &&
125+
effects.count( ammo_effect_TANGLE ) == 0;
126126
// Don't embed in small creatures
127127
if( embed ) {
128128
const creature_size critter_size = mon->get_size();
@@ -150,10 +150,10 @@ static void drop_or_embed_projectile( const dealt_projectile_attack &attack )
150150
// if they aren't friendly they will try and break out of the net/bolas/lasso
151151
// players and NPCs just get the downed effect, and item is dropped.
152152
// TODO: storing the item on player until they recover from downed
153-
if( effects.count( ammo_effect_id_TANGLE ) && mon_there ) {
153+
if( effects.count( ammo_effect_TANGLE ) && mon_there ) {
154154
do_drop = false;
155155
}
156-
if( effects.count( ammo_effect_id_ACT_ON_RANGED_HIT ) ) {
156+
if( effects.count( ammo_effect_ACT_ON_RANGED_HIT ) ) {
157157
// Don't drop if it exploded
158158
do_drop = !dropped_item.activate_thrown( attack.end_point );
159159
}
@@ -163,7 +163,7 @@ static void drop_or_embed_projectile( const dealt_projectile_attack &attack )
163163
here.add_item_or_charges( attack.end_point, dropped_item );
164164
}
165165

166-
if( effects.count( ammo_effect_id_HEAVY_HIT ) ) {
166+
if( effects.count( ammo_effect_HEAVY_HIT ) ) {
167167
if( here.has_flag( ter_furn_flag::TFLAG_LIQUID, pt ) ) {
168168
sounds::sound( pt, 10, sounds::sound_t::combat, _( "splash!" ), false, "bullet_hit", "hit_water" );
169169
} else {
@@ -258,21 +258,21 @@ dealt_projectile_attack projectile_attack( const projectile &proj_arg, const tri
258258
projectile &proj = attack.proj;
259259
const auto &proj_effects = proj.proj_effects;
260260

261-
const bool stream = proj_effects.count( ammo_effect_id_STREAM ) > 0 ||
262-
proj_effects.count( ammo_effect_id_STREAM_TINY ) > 0 ||
263-
proj_effects.count( ammo_effect_id_STREAM_BIG ) > 0 ||
264-
proj_effects.count( ammo_effect_id_JET ) > 0;
261+
const bool stream = proj_effects.count( ammo_effect_STREAM ) > 0 ||
262+
proj_effects.count( ammo_effect_STREAM_TINY ) > 0 ||
263+
proj_effects.count( ammo_effect_STREAM_BIG ) > 0 ||
264+
proj_effects.count( ammo_effect_JET ) > 0;
265265
const char bullet = stream ? '#' : '*';
266-
const bool no_item_damage = proj_effects.count( ammo_effect_id_NO_ITEM_DAMAGE ) > 0;
267-
const bool do_draw_line = proj_effects.count( ammo_effect_id_DRAW_AS_LINE ) > 0;
268-
const bool null_source = proj_effects.count( ammo_effect_id_NULL_SOURCE ) > 0;
266+
const bool no_item_damage = proj_effects.count( ammo_effect_NO_ITEM_DAMAGE ) > 0;
267+
const bool do_draw_line = proj_effects.count( ammo_effect_DRAW_AS_LINE ) > 0;
268+
const bool null_source = proj_effects.count( ammo_effect_NULL_SOURCE ) > 0;
269269
// Determines whether it can penetrate obstacles
270270
const bool is_bullet = proj_arg.speed >= 200 &&
271-
!proj_effects.count( ammo_effect_id_NO_PENETRATE_OBSTACLES );
271+
!proj_effects.count( ammo_effect_NO_PENETRATE_OBSTACLES );
272272

273273
// If we were targeting a tile rather than a monster, don't overshoot
274274
// Unless the target was a wall, then we are aiming high enough to overshoot
275-
const bool no_overshoot = proj_effects.count( ammo_effect_id_NO_OVERSHOOT ) ||
275+
const bool no_overshoot = proj_effects.count( ammo_effect_NO_OVERSHOOT ) ||
276276
( creatures.creature_at( target_arg ) == nullptr && here.passable( target_arg ) );
277277

278278
double extend_to_range = no_overshoot ? range : proj_arg.range;
@@ -333,7 +333,7 @@ dealt_projectile_attack projectile_attack( const projectile &proj_arg, const tri
333333
trajectory.insert( trajectory.begin(), source );
334334

335335
static emit_id muzzle_smoke( "emit_smaller_smoke_plume" );
336-
if( proj_effects.count( ammo_effect_id_MUZZLE_SMOKE ) ) {
336+
if( proj_effects.count( ammo_effect_MUZZLE_SMOKE ) ) {
337337
here.emit_field( trajectory.front(), muzzle_smoke );
338338
}
339339

@@ -518,7 +518,7 @@ dealt_projectile_attack projectile_attack( const projectile &proj_arg, const tri
518518
}
519519

520520
// TODO: Move this outside now that we have hit point in return values?
521-
if( proj.proj_effects.count( ammo_effect_id_BOUNCE ) ) {
521+
if( proj.proj_effects.count( ammo_effect_BOUNCE ) ) {
522522
// Add effect so the shooter is not targeted itself.
523523
if( origin && !origin->has_effect( effect_bounced ) ) {
524524
origin->add_effect( effect_bounced, 1_turns );

‎src/bionics.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ static const trait_id trait_PROF_MED( "PROF_MED" );
176176
static const trait_id trait_PYROMANIA( "PYROMANIA" );
177177
static const trait_id trait_THRESH_MEDICAL( "THRESH_MEDICAL" );
178178

179-
static const ammo_effect_str_id ammo_effect_id_DRAW_AS_LINE( "DRAW_AS_LINE" );
180-
static const ammo_effect_str_id ammo_effect_id_JET( "JET" );
181-
static const ammo_effect_str_id ammo_effect_id_NO_DAMAGE_SCALING( "NO_DAMAGE_SCALING" );
182-
static const ammo_effect_str_id ammo_effect_id_NO_ITEM_DAMAGE( "NO_ITEM_DAMAGE" );
179+
static const ammo_effect_str_id ammo_effect_DRAW_AS_LINE( "DRAW_AS_LINE" );
180+
static const ammo_effect_str_id ammo_effect_JET( "JET" );
181+
static const ammo_effect_str_id ammo_effect_NO_DAMAGE_SCALING( "NO_DAMAGE_SCALING" );
182+
static const ammo_effect_str_id ammo_effect_NO_ITEM_DAMAGE( "NO_ITEM_DAMAGE" );
183183

184184
struct Character::bionic_fuels {
185185
std::vector<vehicle *> connected_vehicles;
@@ -1021,7 +1021,7 @@ bool Character::activate_bionic( bionic &bio, bool eff_only, bool *close_bionics
10211021
proj.impact.add_damage( STATIC( damage_type_id( "bash" ) ), pr.first.weight() / 250_gram );
10221022
// make the projectile stop one tile short to prevent hitting the player
10231023
proj.range = rl_dist( pr.second, pos() ) - 1;
1024-
proj.proj_effects = {{ ammo_effect_id_NO_ITEM_DAMAGE, ammo_effect_id_DRAW_AS_LINE, ammo_effect_id_NO_DAMAGE_SCALING, ammo_effect_id_JET }};
1024+
proj.proj_effects = {{ ammo_effect_NO_ITEM_DAMAGE, ammo_effect_DRAW_AS_LINE, ammo_effect_NO_DAMAGE_SCALING, ammo_effect_JET }};
10251025

10261026
dealt_projectile_attack dealt = projectile_attack(
10271027
proj, pr.second, pos(), dispersion_sources{ 0 }, this );

‎src/creature.cpp‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,20 @@
7777

7878
struct mutation_branch;
7979

80-
static const ammo_effect_str_id ammo_effect_id_APPLY_SAP( "APPLY_SAP" );
81-
static const ammo_effect_str_id ammo_effect_id_BEANBAG( "BEANBAG" );
82-
static const ammo_effect_str_id ammo_effect_id_BLINDS_EYES( "BLINDS_EYES" );
83-
static const ammo_effect_str_id ammo_effect_id_BOUNCE( "BOUNCE" );
84-
static const ammo_effect_str_id ammo_effect_id_FOAMCRETE( "FOAMCRETE" );
85-
static const ammo_effect_str_id ammo_effect_id_LARGE_BEANBAG( "LARGE_BEANBAG" );
86-
static const ammo_effect_str_id ammo_effect_id_MAGIC( "MAGIC" );
87-
static const ammo_effect_str_id ammo_effect_id_NO_DAMAGE_SCALING( "NO_DAMAGE_SCALING" );
88-
static const ammo_effect_str_id ammo_effect_id_NOGIB( "NOGIB" );
89-
static const ammo_effect_str_id ammo_effect_id_PARALYZEPOISON( "PARALYZEPOISON" );
90-
static const ammo_effect_str_id ammo_effect_id_ROBOT_DAZZLE( "ROBOT_DAZZLE" );
91-
static const ammo_effect_str_id ammo_effect_id_TANGLE( "TANGLE" );
92-
static const ammo_effect_str_id ammo_effect_id_IGNITE( "IGNITE" );
93-
static const ammo_effect_str_id ammo_effect_id_INCENDIARY( "INCENDIARY" );
80+
static const ammo_effect_str_id ammo_effect_APPLY_SAP( "APPLY_SAP" );
81+
static const ammo_effect_str_id ammo_effect_BEANBAG( "BEANBAG" );
82+
static const ammo_effect_str_id ammo_effect_BLINDS_EYES( "BLINDS_EYES" );
83+
static const ammo_effect_str_id ammo_effect_BOUNCE( "BOUNCE" );
84+
static const ammo_effect_str_id ammo_effect_FOAMCRETE( "FOAMCRETE" );
85+
static const ammo_effect_str_id ammo_effect_LARGE_BEANBAG( "LARGE_BEANBAG" );
86+
static const ammo_effect_str_id ammo_effect_MAGIC( "MAGIC" );
87+
static const ammo_effect_str_id ammo_effect_NO_DAMAGE_SCALING( "NO_DAMAGE_SCALING" );
88+
static const ammo_effect_str_id ammo_effect_NOGIB( "NOGIB" );
89+
static const ammo_effect_str_id ammo_effect_PARALYZEPOISON( "PARALYZEPOISON" );
90+
static const ammo_effect_str_id ammo_effect_ROBOT_DAZZLE( "ROBOT_DAZZLE" );
91+
static const ammo_effect_str_id ammo_effect_TANGLE( "TANGLE" );
92+
static const ammo_effect_str_id ammo_effect_IGNITE( "IGNITE" );
93+
static const ammo_effect_str_id ammo_effect_INCENDIARY( "INCENDIARY" );
9494

9595
static const anatomy_id anatomy_human_anatomy( "human_anatomy" );
9696

@@ -955,7 +955,7 @@ double Creature::accuracy_projectile_attack( dealt_projectile_attack &attack ) c
955955

956956
void projectile::apply_effects_nodamage( Creature &target, Creature *source ) const
957957
{
958-
if( proj_effects.count( ammo_effect_id_BOUNCE ) ) {
958+
if( proj_effects.count( ammo_effect_BOUNCE ) ) {
959959
target.add_effect( effect_source( source ), effect_bounced, 1_turns );
960960
}
961961
}
@@ -964,7 +964,7 @@ void projectile::apply_effects_damage( Creature &target, Creature *source,
964964
const dealt_damage_instance &dealt_dam, bool critical ) const
965965
{
966966
// Apply ammo effects to target.
967-
if( proj_effects.count( ammo_effect_id_TANGLE ) ) {
967+
if( proj_effects.count( ammo_effect_TANGLE ) ) {
968968
// if its a tameable animal, its a good way to catch them if they are running away, like them ranchers do!
969969
// we assume immediate success, then certain monster types immediately break free in monster.cpp move_effects()
970970
if( target.is_monster() ) {
@@ -987,7 +987,7 @@ void projectile::apply_effects_damage( Creature &target, Creature *source,
987987
}
988988

989989
Character &player_character = get_player_character();
990-
if( proj_effects.count( ammo_effect_id_INCENDIARY ) ) {
990+
if( proj_effects.count( ammo_effect_INCENDIARY ) ) {
991991
if( x_in_y( 1, 100 ) ) { // 1% chance
992992
if( target.made_of( material_veggy ) || target.made_of_any( Creature::cmat_flammable ) ) {
993993
target.add_effect( effect_source( source ), effect_onfire, rng( 2_turns, 6_turns ),
@@ -1005,7 +1005,7 @@ void projectile::apply_effects_damage( Creature &target, Creature *source,
10051005
player_character.rem_morale( MORALE_PYROMANIA_NOFIRE );
10061006
}
10071007
}
1008-
} else if( proj_effects.count( ammo_effect_id_IGNITE ) ) {
1008+
} else if( proj_effects.count( ammo_effect_IGNITE ) ) {
10091009
if( x_in_y( 1, 2 ) ) { // 50% chance
10101010
if( target.made_of( material_veggy ) || target.made_of_any( Creature::cmat_flammable ) ) {
10111011
target.add_effect( effect_source( source ), effect_onfire, 10_turns, dealt_dam.bp_hit );
@@ -1023,7 +1023,7 @@ void projectile::apply_effects_damage( Creature &target, Creature *source,
10231023
}
10241024
}
10251025

1026-
if( proj_effects.count( ammo_effect_id_ROBOT_DAZZLE ) ) {
1026+
if( proj_effects.count( ammo_effect_ROBOT_DAZZLE ) ) {
10271027
if( critical && target.in_species( species_ROBOT ) ) {
10281028
time_duration duration = rng( 6_turns, 8_turns );
10291029
target.add_effect( effect_source( source ), effect_stunned, duration );
@@ -1036,31 +1036,31 @@ void projectile::apply_effects_damage( Creature &target, Creature *source,
10361036
}
10371037

10381038
if( dealt_dam.bp_hit->has_type( body_part_type::type::head ) &&
1039-
proj_effects.count( ammo_effect_id_BLINDS_EYES ) ) {
1039+
proj_effects.count( ammo_effect_BLINDS_EYES ) ) {
10401040
// TODO: Change this to require bp_eyes
10411041
target.add_env_effect( effect_blind,
10421042
target.get_random_body_part_of_type( body_part_type::type::sensor ), 5, rng( 3_turns, 10_turns ) );
10431043
}
10441044

1045-
if( proj_effects.count( ammo_effect_id_APPLY_SAP ) ) {
1045+
if( proj_effects.count( ammo_effect_APPLY_SAP ) ) {
10461046
target.add_effect( effect_source( source ), effect_sap, 1_turns * dealt_dam.total_damage() );
10471047
}
1048-
if( proj_effects.count( ammo_effect_id_PARALYZEPOISON ) && dealt_dam.total_damage() > 0 &&
1048+
if( proj_effects.count( ammo_effect_PARALYZEPOISON ) && dealt_dam.total_damage() > 0 &&
10491049
!dealt_dam.bp_hit->has_flag( json_flag_BIONIC_LIMB ) ) {
10501050
target.add_msg_if_player( m_bad, _( "You feel poison coursing through your body!" ) );
10511051
target.add_effect( effect_source( source ), effect_paralyzepoison, 5_minutes );
10521052
}
10531053

1054-
if( proj_effects.count( ammo_effect_id_FOAMCRETE ) && effect_foamcrete_slow.is_valid() ) {
1054+
if( proj_effects.count( ammo_effect_FOAMCRETE ) && effect_foamcrete_slow.is_valid() ) {
10551055
target.add_msg_if_player( m_bad, _( "The foamcrete stiffens around you!" ) );
10561056
target.add_effect( effect_source( source ), effect_foamcrete_slow, 5_minutes );
10571057
}
10581058

10591059
int stun_strength = 0;
1060-
if( proj_effects.count( ammo_effect_id_BEANBAG ) ) {
1060+
if( proj_effects.count( ammo_effect_BEANBAG ) ) {
10611061
stun_strength = 4;
10621062
}
1063-
if( proj_effects.count( ammo_effect_id_LARGE_BEANBAG ) ) {
1063+
if( proj_effects.count( ammo_effect_LARGE_BEANBAG ) ) {
10641064
stun_strength = 16;
10651065
}
10661066
if( stun_strength > 0 ) {
@@ -1104,7 +1104,7 @@ projectile_attack_results Creature::select_body_part_projectile_attack(
11041104
const projectile &proj, const double goodhit, const double missed_by ) const
11051105
{
11061106
projectile_attack_results ret( proj );
1107-
const bool magic = proj.proj_effects.count( ammo_effect_id_MAGIC ) > 0;
1107+
const bool magic = proj.proj_effects.count( ammo_effect_MAGIC ) > 0;
11081108
double hit_value = missed_by + rng_float( -0.5, 0.5 );
11091109
if( magic ) {
11101110
// Best possible hit
@@ -1230,7 +1230,7 @@ void Creature::messaging_projectile_attack( const Creature *source,
12301230
void Creature::deal_projectile_attack( Creature *source, dealt_projectile_attack &attack,
12311231
bool print_messages, const weakpoint_attack &wp_attack )
12321232
{
1233-
const bool magic = attack.proj.proj_effects.count( ammo_effect_id_MAGIC ) > 0;
1233+
const bool magic = attack.proj.proj_effects.count( ammo_effect_MAGIC ) > 0;
12341234
const double missed_by = attack.missed_by;
12351235
if( missed_by >= 1.0 && !magic ) {
12361236
// Total miss
@@ -1297,13 +1297,13 @@ void Creature::deal_projectile_attack( Creature *source, dealt_projectile_attack
12971297

12981298
// copy it, since we're mutating.
12991299
damage_instance impact = proj.impact;
1300-
if( hit_selection.damage_mult > 0.0f && proj_effects.count( ammo_effect_id_NO_DAMAGE_SCALING ) ) {
1300+
if( hit_selection.damage_mult > 0.0f && proj_effects.count( ammo_effect_NO_DAMAGE_SCALING ) ) {
13011301
hit_selection.damage_mult = 1.0f;
13021302
}
13031303

13041304
impact.mult_damage( hit_selection.damage_mult );
13051305

1306-
if( proj_effects.count( ammo_effect_id_NOGIB ) > 0 ) {
1306+
if( proj_effects.count( ammo_effect_NOGIB ) > 0 ) {
13071307
float dmg_ratio = static_cast<float>( impact.total_damage() ) / get_hp_max( hit_selection.bp_hit );
13081308
if( dmg_ratio > 1.25f ) {
13091309
impact.mult_damage( 1.0f / dmg_ratio );

‎src/explosion.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
#include "vehicle.h"
6565
#include "vpart_position.h"
6666

67-
static const ammo_effect_str_id ammo_effect_id_NULL_SOURCE( "NULL_SOURCE" );
67+
static const ammo_effect_str_id ammo_effect_NULL_SOURCE( "NULL_SOURCE" );
6868

6969
static const damage_type_id damage_bash( "bash" );
7070
static const damage_type_id damage_bullet( "bullet" );
@@ -398,7 +398,7 @@ static std::vector<tripoint> shrapnel( const Creature *source, const tripoint &s
398398
projectile proj;
399399
proj.speed = fragment_velocity;
400400
proj.range = range;
401-
proj.proj_effects.insert( ammo_effect_id_NULL_SOURCE );
401+
proj.proj_effects.insert( ammo_effect_NULL_SOURCE );
402402

403403
struct local_caches {
404404
cata::mdarray<fragment_cloud, point_bub_ms> obstacle_cache;

0 commit comments

Comments
 (0)