Revert "Merge pull request CleverRaven#38141 from ZhilkinSerg/sa-2020…

…-02-18"

This reverts commit 142295b, reversing
changes made to f98c67d.

src/activity_item_handling.cpp

@@ -1942,6 +1942,7 @@ static void fetch_activity( player &p, const tripoint &src_loc,
         src_veh = &vp->vehicle();
         src_part = vp->part_index();
     }
+    std::string picked_up;
     const units::volume volume_allowed = p.volume_capacity() - p.volume_carried();
     const units::mass weight_allowed = p.weight_capacity() - p.weight_carried();
     // TODO: vehicle_stack and map_stack into one loop.
@@ -1991,14 +1992,15 @@ static void fetch_activity( player &p, const tripoint &src_loc,
                     }
                     it.set_var( "activity_var", p.name );
                     p.i_add( it );
+                    picked_up = it.tname();
                     items_there.erase( item_iter );
                     // If we didn't pick up a whole stack, put the remainder back where it came from.
                     if( leftovers.charges > 0 ) {
                         g->m.add_item_or_charges( src_loc, leftovers );
                     }
-                    if( p.is_npc() ) {
+                    if( p.is_npc() && !picked_up.empty() ) {
                         if( pickup_count == 1 ) {
-                            add_msg( _( "%1$s picks up a %2$s." ), p.disp_name(), it.tname() );
+                            add_msg( _( "%1$s picks up a %2$s." ), p.disp_name(), picked_up );
                         } else {
                             add_msg( _( "%s picks up several items." ), p.disp_name() );
                         }

src/advanced_inv_listitem.h

@@ -25,6 +25,7 @@ class item_category;
 class advanced_inv_listitem
 {
     public:
+        using itype_id = std::string;
         /**
          * Index of the item in the itemstack.
          */

src/ammo.h

@@ -5,10 +5,10 @@
 #include <string>
 #include <utility>
 
-#include "type_id.h"
-
 class JsonObject;
 
+using itype_id = std::string;
+
 class ammunition_type
 {
         friend class DynamicDataLoader;

src/avatar_action.cpp

@@ -1124,7 +1124,9 @@ void avatar_action::use_item( avatar &you, item_location &loc )
 // If it's a gun, some gunmods can also be loaded
 void avatar_action::unload( avatar &you )
 {
-    item_location loc = g->inv_map_splice( [&you]( const item & it ) {
+    item_location loc;
+
+    loc = g->inv_map_splice( [&you]( const item & it ) {
         return you.rate_action_unload( it ) == HINT_GOOD;
     }, _( "Unload item" ), 1, _( "You have nothing to unload." ) );
 

src/basecamp.h

@@ -42,6 +42,8 @@ struct expansion_data {
 using npc_ptr = shared_ptr_fast<npc>;
 using comp_list = std::vector<npc_ptr>;
 using Group_tag = std::string;
+using itype_id = std::string;
+
 namespace catacurses
 {
 class window;

src/bionics.h

@@ -21,6 +21,8 @@ class player;
 class JsonObject;
 class JsonIn;
 class JsonOut;
+using itype_id = std::string;
+
 struct bionic_data {
     bionic_data();
 

src/cata_string_consts.h

@@ -3,7 +3,8 @@
 #define STRING_CONSTS_H
 
 #include "type_id.h"
-#include "itype.h"
+#include "player_activity.h"
+
 
 static const activity_id ACT_ADV_INVENTORY( "ACT_ADV_INVENTORY" );
 static const activity_id ACT_AIM( "ACT_AIM" );
@@ -103,6 +104,7 @@ static const activity_id ACT_WAIT_WEATHER( "ACT_WAIT_WEATHER" );
 static const activity_id ACT_WASH( "ACT_WASH" );
 static const activity_id ACT_WEAR( "ACT_WEAR" );
 
+
 static const bionic_id bio_adrenaline( "bio_adrenaline" );
 static const bionic_id bio_ads( "bio_ads" );
 static const bionic_id bio_advreactor( "bio_advreactor" );
@@ -918,6 +920,7 @@ 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_waif( "mon_zombie_waif" );
 
+
 static const std::string flag_ACID( "ACID" );
 static const std::string flag_ACT_IN_FIRE( "ACT_IN_FIRE" );
 static const std::string flag_ACT_ON_RANGED_HIT( "ACT_ON_RANGED_HIT" );
@@ -1271,6 +1274,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" );
@@ -1300,6 +1304,7 @@ static const skill_id skill_traps( "traps" );
 static const skill_id skill_unarmed( "unarmed" );
 static const skill_id skill_weapon( "weapon" );
 
+
 static const quality_id qual_ANESTHESIA( "ANESTHESIA" );
 static const quality_id qual_AXE( "AXE" );
 static const quality_id qual_BUTCHER( "BUTCHER" );
@@ -1318,6 +1323,7 @@ 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" );
@@ -1389,6 +1395,7 @@ static const matype_id style_tiger( "style_tiger" );
 static const matype_id style_wingchun( "style_wingchun" );
 static const matype_id style_zui_quan( "style_zui_quan" );
 
+static const species_id ABERRATION( "ABERRATION" );
 static const species_id species_BLOB( "BLOB" );
 static const species_id FISH( "FISH" );
 static const species_id FUNGUS( "FUNGUS" );

src/cata_tiles.h

@@ -28,6 +28,8 @@ class player;
 class pixel_minimap;
 class JsonObject;
 
+using itype_id = std::string;
+
 extern void set_displaybuffer_rendertarget();
 
 /** Structures */

src/cata_variant.h

@@ -18,6 +18,8 @@ enum body_part : int;
 enum class mutagen_technique : int;
 enum hp_part : int;
 
+using itype_id = std::string;
+
 // cata_variant is a variant-like type that stores a variety of different cata
 // types.  All types are stored by converting them to a string.
 

src/character.cpp

@@ -68,6 +68,7 @@
 #include "vitamin.h"
 #include "vpart_position.h"
 
+
 // *INDENT-OFF*
 Character::Character() :
 
@@ -4004,6 +4005,7 @@ void Character::update_needs( int rate_multiplier )
                 mod_sleep_deprivation( fatigue_roll * 5 );
             }
 
+
             if( npc_no_food && get_fatigue() > TIRED ) {
                 set_fatigue( TIRED );
                 set_sleep_deprivation( 0 );

src/character.h

@@ -764,6 +764,8 @@ class Character : public Creature, public visitable<Character>
 
         std::array<std::array<int, NUM_WATER_TOLERANCE>, num_bp> mut_drench;
 
+        void serialize_consumption_history( JsonOut jsout ) const;
+        void deserialize_consumption_history( JsonArray jarr );
     public:
         // recalculates enchantment cache by iterating through all held, worn, and wielded items
         void recalculate_enchantment_cache();

src/character_martial_arts.cpp

@@ -6,6 +6,8 @@
 #include "output.h"
 #include "cata_string_consts.h"
 
+using itype_id = std::string;
+
 character_martial_arts::character_martial_arts()
 {
 

src/character_martial_arts.h

@@ -13,6 +13,8 @@ class item;
 class JsonOut;
 class JsonIn;
 
+using itype_id = std::string;
+
 class character_martial_arts
 {
     private:

src/event.h

@@ -10,6 +10,8 @@
 #include "enum_conversions.h"
 #include "type_id.h"
 
+using itype_id = std::string;
+
 // An event is something to be passed via the event_bus to subscribers
 // interested in being notified about events.
 //

src/explosion.h

@@ -5,7 +5,7 @@
 #include <map>
 #include <string>
 
-#include "type_id.h"
+using itype_id = std::string;
 
 struct tripoint;
 class JsonObject;

src/game.h

@@ -93,6 +93,7 @@ enum target_mode : int;
 
 struct special_game;
 
+using itype_id = std::string;
 class avatar;
 class event_bus;
 class kill_tracker;

src/gamemode_defense.h

@@ -11,6 +11,8 @@
 #include "type_id.h"
 
 enum action_id : int;
+using itype_id = std::string;
+
 enum defense_style {
     DEFENSE_CUSTOM = 0,
     DEFENSE_EASY,

src/harvest.h

@@ -13,6 +13,7 @@
 #include "translations.h"
 #include "type_id.h"
 
+using itype_id = std::string;
 class JsonObject;
 
 // Could be reused for butchery

src/item.cpp

@@ -9419,6 +9419,8 @@ bool item::has_infinite_charges() const
 skill_id item::contextualize_skill( const skill_id &id ) const
 {
     if( id->is_contextual_skill() ) {
+
+
         if( id == skill_weapon ) {
             if( is_gun() ) {
                 return gun_skill();

src/item.h

@@ -72,6 +72,7 @@ enum m_size : int;
 enum class side : int;
 class body_part_set;
 
+using itype_id = std::string;
 struct fire_data;
 struct damage_instance;
 struct damage_unit;
@@ -144,6 +145,8 @@ struct iteminfo {
             lower_is_better = 1 << 3, ///< Lower values are better for this stat
             no_name = 1 << 4, ///< Do not print the name
             show_plus = 1 << 5, ///< Use a + sign for positive values
+
+
         };
 
         /**

src/item_action.cpp

@@ -34,6 +34,7 @@ struct tripoint;
 
 static item_action nullaction;
 
+
 static char key_bound_to( const input_context &ctxt, const item_action_id &act )
 {
     auto keys = ctxt.keys_bound_to( act );

src/item_factory.cpp

@@ -2219,6 +2219,7 @@ void Item_factory::load_basic_info( const JsonObject &jo, itype &def, const std:
     assign( jo, "insulation", def.insulation_factor );
     assign( jo, "ascii_picture", def.ascii_picture );
 
+
     if( jo.has_member( "thrown_damage" ) ) {
         def.thrown_damage = load_damage_instance( jo.get_array( "thrown_damage" ) );
     } else {

src/itype.h

@@ -36,6 +36,8 @@ enum art_effect_active : int;
 enum art_charge : int;
 enum art_charge_req : int;
 enum art_effect_passive : int;
+using itype_id = std::string;
+
 class gun_modifier_data
 {
     private:

src/iuse.h

@@ -6,7 +6,6 @@
 #include <string>
 #include <vector>
 
-#include "type_id.h"
 #include "clone_ptr.h"
 #include "units.h"
 
@@ -18,6 +17,7 @@ class monster;
 template<typename T> class ret_val;
 struct iteminfo;
 
+using itype_id = std::string;
 struct tripoint;
 
 // iuse methods returning a bool indicating whether to consume a charge of the item being used.
@@ -297,7 +297,7 @@ class iuse_actor
         /**
          * Finalizes the actor. Must be called after all items are loaded.
          */
-        virtual void finalize( const itype_id & ) { }
+        virtual void finalize( const itype_id &/*my_item_type*/ ) { }
 };
 
 struct use_function {

src/iuse_actor.h

@@ -33,6 +33,7 @@ enum hp_part : int;
 enum body_part : int;
 class JsonObject;
 
+using itype_id = std::string;
 struct furn_t;
 struct itype;
 class item_location;

src/map.h

@@ -70,6 +70,7 @@ struct trap;
 
 enum direction : unsigned;
 enum class special_item_type : int;
+using itype_id = std::string;
 template<typename T>
 class visitable;
 struct regional_settings;

src/mapdata.h

@@ -26,6 +26,8 @@ struct tripoint;
 
 using iexamine_function = void ( * )( player &, const tripoint & );
 
+using itype_id = std::string;
+
 struct map_bash_info {
     int str_min;            // min str(*) required to bash
     int str_max;            // max str required: bash succeeds if str >= random # between str_min & str_max

src/material.h

@@ -17,6 +17,7 @@
 class material_type;
 
 enum damage_type : int;
+using itype_id = std::string;
 class JsonObject;
 
 using mat_burn_products = std::vector<std::pair<itype_id, float>>;

src/mtype.h

@@ -34,6 +34,8 @@ using bodytype_id = std::string;
 class JsonArray;
 class JsonObject;
 
+using itype_id = std::string;
+
 // These are triggers which may affect the monster's anger or morale.
 // They are handled in monster::check_triggers(), in monster.cpp
 enum class mon_trigger {

src/mutation.h

@@ -27,6 +27,7 @@ struct dream;
 class Trait_group;
 class item;
 
+using itype_id = std::string;
 class JsonArray;
 
 extern std::vector<dream> dreams;

src/npc_favor.h

@@ -6,6 +6,7 @@
 
 #include "type_id.h"
 
+using itype_id = std::string;
 class JsonIn;
 class JsonOut;
 

src/player.h

@@ -65,6 +65,7 @@ class JsonOut;
 struct dealt_projectile_attack;
 class dispersion_sources;
 
+using itype_id = std::string;
 using faction_id = string_id<faction>;
 struct trap;
 class profession;

src/player_activity.cpp

@@ -4,7 +4,6 @@
 
 #include "activity_handlers.h"
 #include "activity_type.h"
-#include "cata_string_consts.h"
 #include "construction.h"
 #include "map.h"
 #include "game.h"
@@ -13,6 +12,7 @@
 #include "avatar.h"
 #include "itype.h"
 #include "skill.h"
+#include "cata_string_consts.h"
 
 player_activity::player_activity() : type( activity_id::NULL_ID() ) { }