Skip to content

Commit

Permalink
Merge pull request #74421 from CleverRaven/revert-conflicting-fix
Browse files Browse the repository at this point in the history
Revert conflicting fix that caused #74158
  • Loading branch information
Maleclypse authored Jun 10, 2024
2 parents d6f3403 + 2c68dd4 commit e52bd7f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/savegame_json.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5048,7 +5048,7 @@ void submap::load( const JsonValue &jv, const std::string &member_name, int vers
if( spawn_entry.has_more() ) {
spawn_entry.throw_error( "Too many values for spawn" );
}
spawn_point tmp( type, count, p, faction_id, mission_id, friendly, *name );
spawn_point tmp( type, count, p, faction_id, mission_id, friendly, name );
spawns.push_back( tmp );
}
} else if( member_name == "vehicles" ) {
Expand Down

0 comments on commit e52bd7f

Please sign in to comment.