Skip to content

Commit

Permalink
Move string consts from iuse
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ramza13
Ramza13 committed Feb 17, 2020
1 parent 657c637 commit d692f0a
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 73 deletions.
23 changes: 23 additions & 0 deletions src/cata_string_consts.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -945,6 +945,7 @@ static const std::string flag_AUT_START( "AUT_START" );
static const std::string flag_AUTODOC( "AUTODOC" );
static const std::string flag_AUTODOC_COUCH( "AUTODOC_COUCH" );
static const std::string flag_BAD_DAY( "BAD_DAY" );
static const std::string flag_BAROMETER( "BAROMETER" );
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" );
Expand All @@ -961,6 +962,7 @@ static const std::string flag_BOMB( "BOMB" );
static const std::string flag_BUTCHER_EQ( "BUTCHER_EQ" );
static const std::string flag_BYPRODUCT( "BYPRODUCT" );
static const std::string flag_CABLE_SPOOL( "CABLE_SPOOL" );
static const std::string flag_CAMERA_PRO( "CAMERA_PRO" );
static const std::string flag_CAN_SIT( "CAN_SIT" );
static const std::string flag_CANNIBALISM( "CANNIBALISM" );
static const std::string flag_CARNIVORE_OK( "CARNIVORE_OK" );
Expand Down Expand Up @@ -989,6 +991,7 @@ static const std::string flag_DIAMOND( "DIAMOND" );
static const std::string flag_DIFFICULT_Z( "DIFFICULT_Z" );
static const std::string flag_DIG_TOOL( "DIG_TOOL" );
static const std::string flag_DIGGABLE( "DIGGABLE" );
static const std::string flag_DIGGABLE_CAN_DEEPEN( "DIGGABLE_CAN_DEEPEN" );
static const std::string flag_DIMENSIONAL_ANCHOR( "DIMENSIONAL_ANCHOR" );
static const std::string flag_DISABLE_SIGHTS( "DISABLE_SIGHTS" );
static const std::string flag_DONT_REMOVE_ROTTEN( "DONT_REMOVE_ROTTEN" );
Expand Down Expand Up @@ -1058,6 +1061,7 @@ static const std::string flag_HIDDEN_POISON( "HIDDEN_POISON" );
static const std::string flag_HOOD( "HOOD" );
static const std::string flag_HOT( "HOT" );
static const std::string flag_HURT_WHEN_WIELDED( "HURT_WHEN_WIELDED" );
static const std::string flag_HYGROMETER( "HYGROMETER" );
static const std::string flag_IN_CBM( "IN_CBM" );
static const std::string flag_INDOORS( "INDOORS" );
static const std::string flag_INEDIBLE( "INEDIBLE" );
Expand All @@ -1082,9 +1086,18 @@ static const std::string flag_MAG_BELT( "MAG_BELT" );
static const std::string flag_MAG_DESTROY( "MAG_DESTROY" );
static const std::string flag_MAG_EJECT( "MAG_EJECT" );
static const std::string flag_MAGIC_FOCUS( "MAGIC_FOCUS" );
static const std::string flag_MC_ENCRYPTED( "MC_ENCRYPTED" );
static const std::string flag_MC_HAS_DATA( "MC_HAS_DATA" );
static const std::string flag_MC_MAY_BE_ENCRYPTED( "MC_MAY_BE_ENCRYPTED" );
static const std::string flag_MC_MOBILE( "MC_MOBILE" );
static const std::string flag_MC_RANDOM_STUFF( "MC_RANDOM_STUFF" );
static const std::string flag_MC_SCIENCE_STUFF( "MC_SCIENCE_STUFF" );
static const std::string flag_MC_TURN_USED( "MC_TURN_USED" );
static const std::string flag_MC_USED( "MC_USED" );
static const std::string flag_MELTS( "MELTS" );
static const std::string flag_MESSY( "MESSY" );
static const std::string flag_MILLABLE( "MILLABLE" );
static const std::string flag_MINEABLE( "MINEABLE" );
static const std::string flag_MOUNTABLE( "MOUNTABLE" );
static const std::string flag_MOUNTED_GUN( "MOUNTED_GUN" );
static const std::string flag_MUSHY( "MUSHY" );
Expand Down Expand Up @@ -1122,6 +1135,7 @@ static const std::string flag_OVERSIZE( "OVERSIZE" );
static const std::string flag_PARTIAL_DEAF( "PARTIAL_DEAF" );
static const std::string flag_PERPETUAL( "PERPETUAL" );
static const std::string flag_PERSONAL( "PERSONAL" );
static const std::string flag_PLACE_RANDOMLY( "PLACE_RANDOMLY" );
static const std::string flag_PLANT( "PLANT" );
static const std::string flag_PLANTABLE( "PLANTABLE" );
static const std::string flag_PLOWABLE( "PLOWABLE" );
Expand All @@ -1141,6 +1155,7 @@ static const std::string flag_RADIO_CONTAINER( "RADIO_CONTAINER" );
static const std::string flag_RADIO_INVOKE_PROC( "RADIO_INVOKE_PROC" );
static const std::string flag_RADIO_MOD( "RADIO_MOD" );
static const std::string flag_RADIOACTIVE( "RADIOACTIVE" );
static const std::string flag_RADIOCARITEM( "RADIOCARITEM" );
static const std::string flag_RADIOSIGNAL_1( "RADIOSIGNAL_1" );
static const std::string flag_RADIOSIGNAL_2( "RADIOSIGNAL_2" );
static const std::string flag_RADIOSIGNAL_3( "RADIOSIGNAL_3" );
Expand All @@ -1162,6 +1177,7 @@ static const std::string flag_ROLLER_INLINE( "ROLLER_INLINE" );
static const std::string flag_ROLLER_ONE( "ROLLER_ONE" );
static const std::string flag_ROLLER_QUAD( "ROLLER_QUAD" );
static const std::string flag_ROUGH( "ROUGH" );
static const std::string flag_RUBBLE( "RUBBLE" );
static const std::string flag_SAFE_FUEL_OFF( "SAFE_FUEL_OFF" );
static const std::string flag_SAFECRACK( "SAFECRACK" );
static const std::string flag_SALT_WATER( "SALT_WATER" );
Expand Down Expand Up @@ -1227,6 +1243,7 @@ static const std::string flag_WIND_EXTINGUISH( "WIND_EXTINGUISH" );
static const std::string flag_WRITE_MESSAGE( "WRITE_MESSAGE" );
static const std::string flag_YOUNG( "YOUNG" );


static const skill_id skill_archery( "archery" );
static const skill_id skill_barter( "barter" );
static const skill_id skill_bashing( "bashing" );
Expand Down Expand Up @@ -1256,20 +1273,26 @@ static const skill_id skill_traps( "traps" );
static const skill_id skill_unarmed( "unarmed" );
static const skill_id weapon_skill( "weapon" );


static const quality_id qual_ANESTHESIA( "ANESTHESIA" );
static const quality_id qual_AXE( "AXE" );
static const quality_id qual_BUTCHER( "BUTCHER" );
static const quality_id qual_CUT( "CUT" );
static const quality_id qual_CUT_FINE( "CUT_FINE" );
static const quality_id qual_DIG( "DIG" );
static const quality_id qual_DRILL( "DRILL" );
static const quality_id qual_FISHING( "FISHING" );
static const quality_id qual_HAMMER( "HAMMER" );
static const quality_id qual_JACK( "JACK" );
static const quality_id qual_LIFT( "LIFT" );
static const quality_id qual_PRY( "PRY" );
static const quality_id qual_SAW_M( "SAW_M" );
static const quality_id qual_SAW_W( "SAW_W" );
static const quality_id qual_SCREW_FINE( "SCREW_FINE" );
static const quality_id qual_SELF_JACK( "SELF_JACK" );
static const quality_id qual_WELD( "WELD" );


static const zone_type_id zone_investigate_only( "NPC_INVESTIGATE_ONLY" );
static const zone_type_id zone_no_investigate( "NPC_NO_INVESTIGATE" );
static const zone_type_id zone_type_CHOP_TREES( "CHOP_TREES" );
Expand Down
2 changes: 1 addition & 1 deletion src/item_action.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ item_action_map item_action_generator::map_actions_to_items( player &p,

// Don't try to remove 'irremovable' toolmods
if( actual_item->is_toolmod() && use == item_action_id( "TOOLMOD_ATTACH" ) &&
actual_item->has_flag( "IRREMOVABLE" ) ) {
actual_item->has_flag( flag_IRREMOVABLE ) ) {
continue;
}

Expand Down
Loading

0 comments on commit d692f0a

Please sign in to comment.