Skip to content

Commit

Permalink
Revert "More string consts into single file (CleverRaven#38183)"
Browse files Browse the repository at this point in the history 
This reverts commit 05940bf.
  • Loading branch information
@kevingranade
kevingranade committed Feb 25, 2020
1 parent 81ae825 commit d92ac3f
Show file tree
Hide file tree
Showing 32 changed files with 151 additions and 185 deletions.
2 changes: 1 addition & 1 deletion src/activity_handlers.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,7 @@ void activity_handlers::butcher_finish( player_activity *act, player *p )
_( "You did something wrong and hacked the corpse badly. Maybe it's still recoverable." ) );
break;
}
corpse_item.set_flag( flag_FIELD_DRESS_FAILED );
corpse_item.set_flag( "FIELD_DRESS_FAILED" );

g->m.add_splatter( type_gib, p->pos(), rng( corpse->size + 2, ( corpse->size + 1 ) * 2 ) );
g->m.add_splatter( type_blood, p->pos(), rng( corpse->size + 2, ( corpse->size + 1 ) * 2 ) );
Expand Down
31 changes: 0 additions & 31 deletions src/cata_string_consts.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,6 @@ static const mtype_id mon_zombie_tough( "mon_zombie_tough" );
static const mtype_id mon_zombie_waif( "mon_zombie_waif" );

static const std::string flag_ACID( "ACID" );
static const std::string flag_ACID_IMMUNE( "ACID_IMMUNE" );
static const std::string flag_ACT_IN_FIRE( "ACT_IN_FIRE" );
static const std::string flag_ACT_ON_RANGED_HIT( "ACT_ON_RANGED_HIT" );
static const std::string flag_ACTIVE_CLOAKING( "ACTIVE_CLOAKING" );
Expand Down Expand Up @@ -955,13 +954,11 @@ static const std::string flag_BARRICADABLE_DOOR( "BARRICADABLE_DOOR" );
static const std::string flag_BARRICADABLE_DOOR_DAMAGED( "BARRICADABLE_DOOR_DAMAGED" );
static const std::string flag_BARRICADABLE_DOOR_REINFORCED( "BARRICADABLE_DOOR_REINFORCED" );
static const std::string flag_BARRICADABLE_WINDOW_CURTAINS( "BARRICADABLE_WINDOW_CURTAINS" );
static const std::string flag_BASH_IMMUNE( "BASH_IMMUNE" );
static const std::string flag_BATTERY_MOUNT( "BATTERY_MOUNT" );
static const std::string flag_BED( "BED" );
static const std::string flag_BEEPER( "BEEPER" );
static const std::string flag_BELTABLE( "BELTABLE" );
static const std::string flag_BELTED( "BELTED" );
static const std::string flag_BIO_IMMUNE( "BIO_IMMUNE" );
static const std::string flag_BIPOD( "BIPOD" );
static const std::string flag_BIRD( "BIRD" );
static const std::string flag_BLIND( "BLIND" );
Expand Down Expand Up @@ -994,11 +991,9 @@ static const std::string flag_CHARGEDIM( "CHARGEDIM" );
static const std::string flag_CHEMLAB( "CHEMLAB" );
static const std::string flag_CHIMES( "CHIMES" );
static const std::string flag_CITY_START( "CITY_START" );
static const std::string flag_CLIMATE_CONTROL( "CLIMATE_CONTROL" );
static const std::string flag_CLIMB_SIMPLE( "CLIMB_SIMPLE" );
static const std::string flag_CLIMBABLE( "CLIMBABLE" );
static const std::string flag_COLD( "COLD" );
static const std::string flag_COLD_IMMUNE( "COLD_IMMUNE" );
static const std::string flag_COLLAPSES( "COLLAPSES" );
static const std::string flag_COLLAPSIBLE_STOCK( "COLLAPSIBLE_STOCK" );
static const std::string flag_CONDUCTIVE( "CONDUCTIVE" );
Expand All @@ -1012,7 +1007,6 @@ static const std::string flag_CORPSE( "CORPSE" );
static const std::string flag_CRAFTRIG( "CRAFTRIG" );
static const std::string flag_CURRENT( "CURRENT" );
static const std::string flag_CURTAIN( "CURTAIN" );
static const std::string flag_CUT_IMMUNE( "CUT_IMMUNE" );
static const std::string flag_DANGEROUS( "DANGEROUS" );
static const std::string flag_DEAF( "DEAF" );
static const std::string flag_DEEP_WATER( "DEEP_WATER" );
Expand All @@ -1039,18 +1033,8 @@ static const std::string flag_EASY_DECONSTRUCT( "EASY_DECONSTRUCT" );
static const std::string flag_EATEN_COLD( "EATEN_COLD" );
static const std::string flag_EATEN_HOT( "EATEN_HOT" );
static const std::string flag_EDIBLE_FROZEN( "EDIBLE_FROZEN" );
static const std::string flag_EFFECT_ACID_IMMUNE( "EFFECT_ACID_IMMUNE" );
static const std::string flag_EFFECT_BASH_IMMUNE( "EFFECT_BASH_IMMUNE" );
static const std::string flag_EFFECT_BIO_IMMUNE( "EFFECT_BIO_IMMUNE" );
static const std::string flag_EFFECT_COLD_IMMUNE( "EFFECT_COLD_IMMUNE" );
static const std::string flag_EFFECT_CUT_IMMUNE( "EFFECT_CUT_IMMUNE" );
static const std::string flag_EFFECT_ELECTRIC_IMMUNE( "EFFECT_ELECTRIC_IMMUNE" );
static const std::string flag_EFFECT_FEATHER_FALL( "EFFECT_FEATHER_FALL" );
static const std::string flag_EFFECT_HEAT_IMMUNE( "EFFECT_HEAT_IMMUNE" );
static const std::string flag_EFFECT_INVISIBLE( "EFFECT_INVISIBLE" );
static const std::string flag_EFFECT_NIGHT_VISION( "EFFECT_NIGHT_VISION" );
static const std::string flag_EFFECT_STAB_IMMUNE( "EFFECT_STAB_IMMUNE" );
static const std::string flag_ELECTRIC_IMMUNE( "ELECTRIC_IMMUNE" );
static const std::string flag_EMITTER( "EMITTER" );
static const std::string flag_ENGINE( "ENGINE" );
static const std::string flag_ETHEREAL_ITEM( "ETHEREAL_ITEM" );
Expand All @@ -1064,7 +1048,6 @@ static const std::string flag_FERTILIZER( "FERTILIZER" );
static const std::string flag_FIELD_DRESS( "FIELD_DRESS" );
static const std::string flag_FIELD_DRESS_FAILED( "FIELD_DRESS_FAILED" );
static const std::string flag_FILTHY( "FILTHY" );
static const std::string flag_FIN( "FIN" );
static const std::string flag_FIRE( "FIRE" );
static const std::string flag_FIRE_100( "FIRE_100" );
static const std::string flag_FIRE_20( "FIRE_20" );
Expand Down Expand Up @@ -1112,7 +1095,6 @@ static const std::string flag_GROWTH_HARVEST( "GROWTH_HARVEST" );
static const std::string flag_GROWTH_MATURE( "GROWTH_MATURE" );
static const std::string flag_GROWTH_SEEDLING( "GROWTH_SEEDLING" );
static const std::string flag_HALF_BOARD( "HALF_BOARD" );
static const std::string flag_HEAT_IMMUNE( "HEAT_IMMUNE" );
static const std::string flag_HELI_CRASH( "HELI_CRASH" );
static const std::string flag_HELMET_COMPAT( "HELMET_COMPAT" );
static const std::string flag_HIDDEN_HALLU( "HIDDEN_HALLU" );
Expand Down Expand Up @@ -1187,22 +1169,19 @@ static const std::string flag_NEGATIVE_MONOTONY_OK( "NEGATIVE_MONOTONY_OK" );
static const std::string flag_NEVER_JAMS( "NEVER_JAMS" );
static const std::string flag_no_auto_equip( "no_auto_equip" );
static const std::string flag_NO_CVD( "NO_CVD" );
static const std::string flag_NO_DISEASE( "NO_DISEASE" );
static const std::string flag_NO_DISPLAY( "NO_DISPLAY" );
static const std::string flag_NO_DROP( "NO_DROP" );
static const std::string flag_NO_INGEST( "NO_INGEST" );
static const std::string flag_NO_PACKED( "NO_PACKED" );
static const std::string flag_NO_PARASITES( "NO_PARASITES" );
static const std::string flag_NO_QUICKDRAW( "NO_QUICKDRAW" );
static const std::string flag_NO_RADIATION( "NO_RADIATION" );
static const std::string flag_NO_RELOAD( "NO_RELOAD" );
static const std::string flag_NO_REPAIR( "NO_REPAIR" );
static const std::string flag_NO_RESIZE( "NO_RESIZE" );
static const std::string flag_NO_ROOF_NEEDED( "NO_ROOF_NEEDED" );
static const std::string flag_NO_SALVAGE( "NO_SALVAGE" );
static const std::string flag_NO_STERILE( "NO_STERILE" );
static const std::string flag_NO_TAKEOFF( "NO_TAKEOFF" );
static const std::string flag_NO_THIRST( "NO_THIRST" );
static const std::string flag_NO_UNLOAD( "NO_UNLOAD" );
static const std::string flag_NO_UNWIELD( "NO_UNWIELD" );
static const std::string flag_NOCOLLIDE( "NOCOLLIDE" );
Expand Down Expand Up @@ -1247,12 +1226,10 @@ static const std::string flag_PROCESSING_RESULT( "PROCESSING_RESULT" );
static const std::string flag_PROTRUSION( "PROTRUSION" );
static const std::string flag_PSEUDO( "PSEUDO" );
static const std::string flag_PSYCHOPATH( "PSYCHOPATH" );
static const std::string flag_PSYSHIELD_PARTIAL( "PSYSHIELD_PARTIAL" );
static const std::string flag_PULPED( "PULPED" );
static const std::string flag_PUMP_ACTION( "PUMP_ACTION" );
static const std::string flag_PUMP_RAIL_COMPATIBLE( "PUMP_RAIL_COMPATIBLE" );
static const std::string flag_QUARTERED( "QUARTERED" );
static const std::string flag_RAD_PROOF( "RAD_PROOF" );
static const std::string flag_RAD_RESIST( "RAD_RESIST" );
static const std::string flag_RADIO_ACTIVATION( "RADIO_ACTIVATION" );
static const std::string flag_RADIO_CONTAINER( "RADIO_CONTAINER" );
Expand All @@ -1271,15 +1248,13 @@ static const std::string flag_RAMP_END( "RAMP_END" );
static const std::string flag_RAW( "RAW" );
static const std::string flag_REACH_ATTACK( "REACH_ATTACK" );
static const std::string flag_REACH3( "REACH3" );
static const std::string flag_REBREATHER( "REBREATHER" );
static const std::string flag_RECHARGE( "RECHARGE" );
static const std::string flag_REDUCED_BASHING( "REDUCED_BASHING" );
static const std::string flag_REDUCED_WEIGHT( "REDUCED_WEIGHT" );
static const std::string flag_RELOAD_AND_SHOOT( "RELOAD_AND_SHOOT" );
static const std::string flag_RELOAD_EJECT( "RELOAD_EJECT" );
static const std::string flag_RELOAD_ONE( "RELOAD_ONE" );
static const std::string flag_REMOTE_CONTROLS( "REMOTE_CONTROLS" );
static const std::string flag_REQUIRES_BALANCE( "REQUIRES_BALANCE" );
static const std::string flag_REQUIRES_TINDER( "REQUIRES_TINDER" );
static const std::string flag_RESTRICT_HANDS( "RESTRICT_HANDS" );
static const std::string flag_REVIVE_SPECIAL( "REVIVE_SPECIAL" );
Expand All @@ -1302,15 +1277,13 @@ static const std::string flag_SECRET( "SECRET" );
static const std::string flag_SECURITY( "SECURITY" );
static const std::string flag_SEMITANGIBLE( "SEMITANGIBLE" );
static const std::string flag_SHARP( "SHARP" );
static const std::string flag_SHORT( "SHORT" );
static const std::string flag_SHRUB( "SHRUB" );
static const std::string flag_SIGN( "SIGN" );
static const std::string flag_SILENT( "SILENT" );
static const std::string flag_SKINNED( "SKINNED" );
static const std::string flag_SKINTIGHT( "SKINTIGHT" );
static const std::string flag_SLEEP_AID( "SLEEP_AID" );
static const std::string flag_SLOW_WIELD( "SLOW_WIELD" );
static const std::string flag_SLOWS_MOVEMENT( "SLOWS_MOVEMENT" );
static const std::string flag_SLOWS_THIRST( "SLOWS_THIRST" );
static const std::string flag_SMOKABLE( "SMOKABLE" );
static const std::string flag_SMOKED( "SMOKED" );
Expand All @@ -1320,7 +1293,6 @@ static const std::string flag_SPEAR( "SPEAR" );
static const std::string flag_SPEEDLOADER( "SPEEDLOADER" );
static const std::string flag_SPLINT( "SPLINT" );
static const std::string flag_SPR_START( "SPR_START" );
static const std::string flag_STAB_IMMUNE( "STAB_IMMUNE" );
static const std::string flag_STABLE( "STABLE" );
static const std::string flag_STEERABLE( "STEERABLE" );
static const std::string flag_STEREO( "STEREO" );
Expand All @@ -1346,13 +1318,11 @@ static const std::string flag_TOBACCO( "TOBACCO" );
static const std::string flag_TRACK( "TRACK" );
static const std::string flag_TRACKED( "TRACKED" );
static const std::string flag_TRADER_AVOID( "TRADER_AVOID" );
static const std::string flag_TRANSLOCATOR( "TRANSLOCATOR" );
static const std::string flag_TRANSPARENT( "TRANSPARENT" );
static const std::string flag_TREE( "TREE" );
static const std::string flag_TURRET( "TURRET" );
static const std::string flag_TURRET_CONTROLS( "TURRET_CONTROLS" );
static const std::string flag_TURRET_MOUNT( "TURRET_MOUNT" );
static const std::string flag_TWO_WAY_RADIO( "TWO_WAY_RADIO" );
static const std::string flag_UNARMED_BONUS( "UNARMED_BONUS" );
static const std::string flag_UNARMED_WEAPON( "UNARMED_WEAPON" );
static const std::string flag_UNBREAKABLE_MELEE( "UNBREAKABLE_MELEE" );
Expand Down Expand Up @@ -1399,7 +1369,6 @@ static const std::string flag_WINDSHIELD( "WINDSHIELD" );
static const std::string flag_WORKBENCH( "WORKBENCH" );
static const std::string flag_WRITE_MESSAGE( "WRITE_MESSAGE" );
static const std::string flag_YOUNG( "YOUNG" );
static const std::string flag_ZOOM( "ZOOM" );

static const skill_id skill_archery( "archery" );
static const skill_id skill_barter( "barter" );
Expand Down
62 changes: 31 additions & 31 deletions src/character.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2619,9 +2619,9 @@ void Character::do_skill_rust()
SkillLevel &skill_level_obj = pair.second;

if( aSkill.is_combat_skill() &&
( ( has_trait_flag( flag_PRED2 ) && calendar::once_every( 8_hours ) ) ||
( has_trait_flag( flag_PRED3 ) && calendar::once_every( 4_hours ) ) ||
( has_trait_flag( flag_PRED4 ) && calendar::once_every( 3_hours ) ) ) ) {
( ( has_trait_flag( "PRED2" ) && calendar::once_every( 8_hours ) ) ||
( has_trait_flag( "PRED3" ) && calendar::once_every( 4_hours ) ) ||
( has_trait_flag( "PRED4" ) && calendar::once_every( 3_hours ) ) ) ) {
// Their brain is optimized to remember this
if( one_in( 13 ) ) {
// They've already passed the roll to avoid rust at
Expand Down Expand Up @@ -2928,7 +2928,7 @@ bool Character::in_climate_control()
if( w.active && w.is_power_armor() ) {
return true;
}
if( worn_with_flag( flag_CLIMATE_CONTROL ) ) {
if( worn_with_flag( "CLIMATE_CONTROL" ) ) {
return true;
}
}
Expand Down Expand Up @@ -3586,7 +3586,7 @@ std::pair<std::string, nc_color> Character::get_fatigue_description() const

void Character::mod_thirst( int nthirst )
{
if( has_trait_flag( flag_NO_THIRST ) ) {
if( has_trait_flag( "NO_THIRST" ) ) {
return;
}
set_thirst( std::max( -100, thirst + nthirst ) );
Expand Down Expand Up @@ -4369,7 +4369,7 @@ void Character::check_needs_extremes()
void Character::get_sick()
{
// NPCs are too dumb to handle infections now
if( is_npc() || has_trait_flag( flag_NO_DISEASE ) ) {
if( is_npc() || has_trait_flag( "NO_DISEASE" ) ) {
// In a shocking twist, disease immunity prevents diseases.
return;
}
Expand Down Expand Up @@ -5497,34 +5497,34 @@ bool Character::is_immune_damage( const damage_type dt ) const
case DT_TRUE:
return false;
case DT_BIOLOGICAL:
return has_effect_with_flag( flag_EFFECT_BIO_IMMUNE ) ||
worn_with_flag( flag_BIO_IMMUNE );
return has_effect_with_flag( "EFFECT_BIO_IMMUNE" ) ||
worn_with_flag( "BIO_IMMUNE" );
case DT_BASH:
return has_effect_with_flag( flag_EFFECT_BASH_IMMUNE ) ||
worn_with_flag( flag_BASH_IMMUNE );
return has_effect_with_flag( "EFFECT_BASH_IMMUNE" ) ||
worn_with_flag( "BASH_IMMUNE" );
case DT_CUT:
return has_effect_with_flag( flag_EFFECT_CUT_IMMUNE ) ||
worn_with_flag( flag_CUT_IMMUNE );
return has_effect_with_flag( "EFFECT_CUT_IMMUNE" ) ||
worn_with_flag( "CUT_IMMUNE" );
case DT_ACID:
return has_trait( trait_ACIDPROOF ) ||
has_effect_with_flag( flag_EFFECT_ACID_IMMUNE ) ||
worn_with_flag( flag_ACID_IMMUNE );
has_effect_with_flag( "EFFECT_ACID_IMMUNE" ) ||
worn_with_flag( "ACID_IMMUNE" );
case DT_STAB:
return has_effect_with_flag( flag_EFFECT_STAB_IMMUNE ) ||
worn_with_flag( flag_STAB_IMMUNE );
return has_effect_with_flag( "EFFECT_STAB_IMMUNE" ) ||
worn_with_flag( "STAB_IMMUNE" );
case DT_HEAT:
return has_trait( trait_M_SKIN2 ) ||
has_trait( trait_M_SKIN3 ) ||
has_effect_with_flag( flag_EFFECT_HEAT_IMMUNE ) ||
worn_with_flag( flag_HEAT_IMMUNE );
has_effect_with_flag( "EFFECT_HEAT_IMMUNE" ) ||
worn_with_flag( "HEAT_IMMUNE" );
case DT_COLD:
return has_effect_with_flag( flag_EFFECT_COLD_IMMUNE ) ||
worn_with_flag( flag_COLD_IMMUNE );
return has_effect_with_flag( "EFFECT_COLD_IMMUNE" ) ||
worn_with_flag( "COLD_IMMUNE" );
case DT_ELECTRIC:
return has_active_bionic( bio_faraday ) ||
worn_with_flag( flag_ELECTRIC_IMMUNE ) ||
worn_with_flag( "ELECTRIC_IMMUNE" ) ||
has_artifact_with( AEP_RESIST_ELECTRICITY ) ||
has_effect_with_flag( flag_EFFECT_ELECTRIC_IMMUNE );
has_effect_with_flag( "EFFECT_ELECTRIC_IMMUNE" );
default:
return true;
}
Expand All @@ -5533,7 +5533,7 @@ bool Character::is_immune_damage( const damage_type dt ) const
bool Character::is_rad_immune() const
{
bool has_helmet = false;
return ( is_wearing_power_armor( &has_helmet ) && has_helmet ) || worn_with_flag( flag_RAD_PROOF );
return ( is_wearing_power_armor( &has_helmet ) && has_helmet ) || worn_with_flag( "RAD_PROOF" );
}

int Character::throw_range( const item &it ) const
Expand Down Expand Up @@ -6462,7 +6462,7 @@ void Character::set_rad( int new_rad )

void Character::mod_rad( int mod )
{
if( has_trait_flag( flag_NO_RADIATION ) ) {
if( has_trait_flag( "NO_RADIATION" ) ) {
return;
}
set_rad( std::max( 0, get_rad() + mod ) );
Expand Down Expand Up @@ -7953,7 +7953,7 @@ bool Character::covered_with_flag( const std::string &flag, const body_part_set

bool Character::is_waterproof( const body_part_set &parts ) const
{
return covered_with_flag( flag_WATERPROOF, parts );
return covered_with_flag( "WATERPROOF", parts );
}

void Character::update_morale()
Expand Down Expand Up @@ -8627,10 +8627,10 @@ bool Character::has_fire( const int quantity ) const

if( g->m.has_nearby_fire( pos() ) ) {
return true;
} else if( has_item_with_flag( flag_FIRE ) ) {
} else if( has_item_with_flag( "FIRE" ) ) {
return true;
} else if( has_item_with_flag( flag_FIRESTARTER ) ) {
auto firestarters = all_items_with_flag( flag_FIRESTARTER );
} else if( has_item_with_flag( "FIRESTARTER" ) ) {
auto firestarters = all_items_with_flag( "FIRESTARTER" );
for( auto &i : firestarters ) {
if( has_charges( i->typeId(), quantity ) ) {
return true;
Expand Down Expand Up @@ -8686,10 +8686,10 @@ void Character::use_fire( const int quantity )

if( g->m.has_nearby_fire( pos() ) ) {
return;
} else if( has_item_with_flag( flag_FIRE ) ) {
} else if( has_item_with_flag( "FIRE" ) ) {
return;
} else if( has_item_with_flag( flag_FIRESTARTER ) ) {
auto firestarters = all_items_with_flag( flag_FIRESTARTER );
} else if( has_item_with_flag( "FIRESTARTER" ) ) {
auto firestarters = all_items_with_flag( "FIRESTARTER" );
for( auto &i : firestarters ) {
if( has_charges( i->typeId(), quantity ) ) {
use_charges( i->typeId(), quantity );
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 @@ -632,7 +632,7 @@ ret_val<edible_rating> Character::will_eat( const item &food, bool interactive )
}

const bool carnivore = has_trait( trait_CARNIVORE );
if( food.has_flag( flag_CANNIBALISM ) && !has_trait_flag( flag_CANNIBAL ) ) {
if( food.has_flag( flag_CANNIBALISM ) && !has_trait_flag( "CANNIBAL" ) ) {
add_consequence( _( "The thought of eating human flesh makes you feel sick." ), CANNIBALISM );
}

Expand Down
4 changes: 2 additions & 2 deletions src/faction.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -546,8 +546,8 @@ int npc::faction_display( const catacurses::window &fac_w, const int width ) con
}
std::string can_see;
nc_color see_color;
bool u_has_radio = g->u.has_item_with_flag( flag_TWO_WAY_RADIO, true );
bool guy_has_radio = has_item_with_flag( flag_TWO_WAY_RADIO, true );
bool u_has_radio = g->u.has_item_with_flag( "TWO_WAY_RADIO", true );
bool guy_has_radio = has_item_with_flag( "TWO_WAY_RADIO", true );
// TODO: NPCS on mission contactable same as travelling
if( has_companion_mission() && mission != NPC_MISSION_TRAVELLING ) {
can_see = _( "Not interactable while on a mission" );
Expand Down
10 changes: 5 additions & 5 deletions src/game.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8834,11 +8834,11 @@ bool game::walk_move( const tripoint &dest_loc )
if( u.is_mounted() ) {
auto crit = u.mounted_creature.get();
if( !crit->has_flag( MF_RIDEABLE_MECH ) &&
( m.has_flag_ter_or_furn( flag_MOUNTABLE, dest_loc ) ||
m.has_flag_ter_or_furn( flag_BARRICADABLE_DOOR, dest_loc ) ||
m.has_flag_ter_or_furn( flag_OPENCLOSE_INSIDE, dest_loc ) ||
m.has_flag_ter_or_furn( flag_BARRICADABLE_DOOR_DAMAGED, dest_loc ) ||
m.has_flag_ter_or_furn( flag_BARRICADABLE_DOOR_REINFORCED, dest_loc ) ) ) {
( m.has_flag_ter_or_furn( "MOUNTABLE", dest_loc ) ||
m.has_flag_ter_or_furn( "BARRICADABLE_DOOR", dest_loc ) ||
m.has_flag_ter_or_furn( "OPENCLOSE_INSIDE", dest_loc ) ||
m.has_flag_ter_or_furn( "BARRICADABLE_DOOR_DAMAGED", dest_loc ) ||
m.has_flag_ter_or_furn( "BARRICADABLE_DOOR_REINFORCED", dest_loc ) ) ) {
add_msg( m_warning, _( "You cannot pass obstacles whilst mounted." ) );
return false;
}
Expand Down
Loading

0 comments on commit d92ac3f

Please sign in to comment.