[WIP] Fixed "Auto-sort infinite loop/game hang #29573" (rebased)

data/json/player_activities.json

@@ -289,9 +289,7 @@
     "type": "activity_type",
     "activity_level": "MODERATE_EXERCISE",
     "verb": "sorting out the loot",
-    "suspendable": false,
-    "based_on": "neither",
-    "no_resume": true
+    "based_on": "neither"
   },
   {
     "id": "ACT_TILL_PLOT",
@@ -307,18 +305,14 @@
     "type": "activity_type",
     "activity_level": "MODERATE_EXERCISE",
     "verb": "fetching components",
-    "suspendable": false,
-    "based_on": "neither",
-    "no_resume": true
+    "based_on": "neither"
   },
   {
     "id": "ACT_MULTIPLE_FARM",
     "type": "activity_type",
     "activity_level": "ACTIVE_EXERCISE",
     "verb": "farming",
-    "suspendable": false,
-    "based_on": "neither",
-    "no_resume": true
+    "based_on": "neither"
   },
   {
     "id": "ACT_PLANT_PLOT",

src/activity_handlers.cpp

@@ -3101,10 +3101,6 @@ void activity_handlers::churn_finish( player_activity *act, player *p )
     // Go back to what we were doing before
     // could be player zone activity, or could be NPC multi-farming
     act->set_to_null();
-    if( !p->backlog.empty() ) {
-        p->activity = p->backlog.front();
-        p->backlog.pop_front();
-    }
 }
 
 void activity_handlers::build_do_turn( player_activity *act, player *p )

src/activity_handlers.h

@@ -42,6 +42,7 @@ enum do_activity_reason : int {
     NEEDS_HARVESTING,       // For farming - tile is harvestable now.
     NEEDS_PLANTING,         // For farming - tile can be planted
     NEEDS_TILLING,          // For farming - tile can be tilled
+    NEEDS_FETCHING,         // Generic fetching required
     BLOCKING_TILE           // Something has made it's way onto the tile, so the activity cannot proceed
 };
 
@@ -76,7 +77,6 @@ int butcher_time_to_cut( const player &u, const item &corpse_item, butcher_type
 // activity_item_handling.cpp
 void activity_on_turn_drop();
 void activity_on_turn_move_items( player_activity &act, player &p );
-void activity_on_turn_move_loot( player_activity &act, player &p );
 void generic_multi_activity_handler( player_activity &act, player &p );
 void activity_on_turn_fetch( player_activity &, player *p );
 void activity_on_turn_pickup();

src/clzones.cpp

@@ -1104,45 +1104,6 @@ void zone_manager::rotate_zones( map &target_map, const int turns )
     }
 }
 
-void zone_manager::start_sort( const std::vector<tripoint> &src_sorted )
-{
-    for( auto &src : src_sorted ) {
-        num_processed[src] = 0;
-    }
-}
-
-void zone_manager::end_sort()
-{
-    num_processed.clear();
-}
-
-bool zone_manager::is_sorting() const
-{
-    return !num_processed.empty();
-}
-
-int zone_manager::get_num_processed( const tripoint &src ) const
-{
-    auto it = num_processed.find( src );
-    if( it != num_processed.end() ) {
-        return it->second;
-    }
-    return 0;
-}
-
-void zone_manager::increment_num_processed( const tripoint &src )
-{
-    num_processed[src]++;
-}
-
-void zone_manager::decrement_num_processed( const tripoint &src )
-{
-    num_processed[src]--;
-    if( num_processed[src] < 0 ) {
-        num_processed[src] = 0;
-    }
-}
-
 std::vector<zone_manager::ref_zone_data> zone_manager::get_zones( const faction_id &fac )
 {
     auto zones = std::vector<ref_zone_data>();

src/clzones.h

@@ -344,9 +344,6 @@ class zone_manager
         std::unordered_set<tripoint> get_vzone_set( const zone_type_id &type,
                 const faction_id &fac = your_fac ) const;
 
-        //Cache number of items already checked on each source tile when sorting
-        std::unordered_map<tripoint, int> num_processed;
-
     public:
         zone_manager();
         ~zone_manager() = default;
@@ -407,12 +404,6 @@ class zone_manager
                 const faction_id &fac = your_fac ) const;
         std::unordered_set<tripoint> get_point_set_loot( const tripoint &where, int radius,
                 bool npc_search, const faction_id &fac = your_fac ) const;
-        void start_sort( const std::vector<tripoint> &src_sorted );
-        void end_sort();
-        bool is_sorting() const;
-        int get_num_processed( const tripoint &src ) const;
-        void increment_num_processed( const tripoint &src );
-        void decrement_num_processed( const tripoint &src );
 
         // 'direct' access to zone_manager::zones, giving direct access was nono
         std::vector<ref_zone_data> get_zones( const faction_id &fac = your_fac );

src/construction.cpp

@@ -928,12 +928,6 @@ void complete_construction( player *p )
     // This comes after clearing the activity, in case the function interrupts
     // activities
     built.post_special( terp );
-    // npcs will automatically resume backlog, players wont.
-    if( p->is_player() && !p->backlog.empty() &&
-        p->backlog.front().id() == activity_id( "ACT_MULTIPLE_CONSTRUCTION" ) ) {
-        p->backlog.clear();
-        p->assign_activity( activity_id( "ACT_MULTIPLE_CONSTRUCTION" ) );
-    }
 }
 
 bool construct::check_empty( const tripoint &p )

src/savegame_json.cpp

@@ -245,6 +245,7 @@ void player_activity::serialize( JsonOut &json ) const
         json.member( "index", index );
         json.member( "position", position );
         json.member( "coords", coords );
+        json.member( "coord_set", coord_set );
         json.member( "name", name );
         json.member( "targets", targets );
         json.member( "placement", placement );
@@ -281,6 +282,7 @@ void player_activity::deserialize( JsonIn &jsin )
     data.read( "index", index );
     position = tmppos;
     data.read( "coords", coords );
+    data.read( "coord_set", coord_set );
     data.read( "name", name );
     data.read( "targets", targets );
     data.read( "placement", placement );