Merge branch 'spring-refactor' into test-release

src/character.cpp

@@ -3069,6 +3069,8 @@ units::mass Character::weight_carried_reduced_by( const excluded_stacks &without
             weaponweight = weapon->weight();
         } else if( subtract_count > 1 ) {
             debugmsg( "Trying to remove more than one wielded item" );
+        } else {
+            subtract_count = 0;
         }
     }
     // Exclude wielded item if using lifting tool

src/player_activity.cpp

@@ -377,7 +377,7 @@ void player_activity::do_turn( player &p )
             }
         }
     }
-    if( !*this ) {
+    if( !p.activity ) {
         // Make sure data of previous activity is cleared
         p.activity = std::make_unique<player_activity>();
         p.resume_backlog_activity();