Merge pull request #43987 from Qrox/misc-fixes

Misc fixes

data/mods/More_Locations/military_outpost/mil_outpost_uteb_04.json

@@ -1,7 +1,7 @@
 [
   {
     "type": "mapgen",
-    "om_terrain": [ "mil_outpost_ute" ],
+    "om_terrain": [ "mil_outpost_uteb" ],
     "//": "underground top edge. B stair",
     "method": "json",
     "weight": 100,

src/item_contents.cpp

@@ -89,7 +89,7 @@ void pocket_favorite_callback::refresh( uilist *menu )
                         c_light_gray, format_item_info( info, {} ) );
     }
 
-    wrefresh( menu->window );
+    wnoutrefresh( menu->window );
 }
 
 static std::string keys_text()

src/player_activity.cpp

@@ -363,6 +363,10 @@ bool player_activity::can_resume_with( const player_activity &other, const Chara
         return false;
     }
 
+    if( id() != other.id() ) {
+        return false;
+    }
+
     // if actor XOR other.actor then id() != other.id() so
     // we will correctly return false based on final return statement
     if( actor && other.actor ) {
@@ -387,9 +391,13 @@ bool player_activity::can_resume_with( const player_activity &other, const Chara
         if( targets.empty() || other.targets.empty() || targets[0] != other.targets[0] ) {
             return false;
         }
+    } else if( id() == activity_id( "ACT_VEHICLE" ) ) {
+        if( values != other.values || str_values != other.str_values ) {
+            return false;
+        }
     }
 
-    return !auto_resume && id() == other.id() && index == other.index &&
+    return !auto_resume && index == other.index &&
            position == other.position && name == other.name && targets == other.targets;
 }