Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed mutable copy-from #3666

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Fixed mutable copy-from #3666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/mapgen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5293,14 +5293,6 @@ void map::draw_connections( mapgendata &dat )
ter_set( point( SEEX - 3, SEEY ), t_door_metal_c );
ter_set( point( SEEX - 3, SEEY - 1 ), t_door_metal_c );
}
} else if( is_ot_match( "ants", terrain_type, ot_match_type::type ) ) {
if( dat.above() == "anthill" ) {
if( const auto p = random_point( *this, [this]( const tripoint & n ) {
return ter( n ) == t_rock_floor;
} ) ) {
ter_set( *p, t_slope_up );
}
}
}

// finally, any terrain with SIDEWALKS should contribute sidewalks to neighboring diagonal roads
Expand Down
23 changes: 17 additions & 6 deletions src/overmap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,6 +1176,7 @@ struct mutable_overmap_terrain_join {
} else {
debugmsg( "invalid join id %s in %s", join_id, context );
}
alternative_joins.clear();
for( const std::string &alt_join_id : alternative_join_ids ) {
auto alt_join_it = joins.find( alt_join_id );
if( alt_join_it != joins.end() ) {
Expand Down Expand Up @@ -1383,6 +1384,7 @@ struct mutable_overmap_placement_rule {
piece.overmap = &it->second;
}
}
outward_joins.clear();
for( const mutable_overmap_placement_rule_piece &piece : pieces ) {
const mutable_overmap_terrain &ter = *piece.overmap;
for( const join_map::value_type &p : ter.joins ) {
Expand Down Expand Up @@ -2492,11 +2494,19 @@ void overmap_special::load( const JsonObject &jo, const std::string &src )

switch( subtype_ ) {
case overmap_special_subtype::fixed:
if( was_loaded ) {
mutable_data_.reset();
}

mandatory( jo, was_loaded, "overmaps", fixed_data_.terrains );
break;
case overmap_special_subtype::mutable_: {
shared_ptr_fast<mutable_overmap_special_data> mutable_data;
if( was_loaded ) {
fixed_data_ = fixed_overmap_special_data{};
}

shared_ptr_fast<mutable_overmap_special_data> mutable_data;
if( was_loaded && mutable_data_ ) {
mutable_data = make_shared_fast<mutable_overmap_special_data>( *mutable_data_ );
} else {
mutable_data = make_shared_fast<mutable_overmap_special_data>( id );
Expand All @@ -2506,9 +2516,9 @@ void overmap_special::load( const JsonObject &jo, const std::string &src )
cata::flat_set<overmap_location_id> type;
tripoint from;
tripoint to;
mandatory( joc, was_loaded, "type", type );
mandatory( joc, was_loaded, "from", from );
mandatory( joc, was_loaded, "to", to );
mandatory( joc, false, "type", type );
mandatory( joc, false, "from", from );
mandatory( joc, false, "to", to );
if( from.x > to.x ) {
std::swap( from.x, to.x );
}
Expand Down Expand Up @@ -2544,12 +2554,13 @@ void overmap_special::load( const JsonObject &jo, const std::string &src )
}

if( jo.has_array( "place_nested" ) ) {
nested_.clear();
JsonArray jar = jo.get_array( "place_nested" );
while( jar.has_more() ) {
JsonObject joc = jar.next_object();
std::pair<tripoint_rel_omt, overmap_special_id> nested;
mandatory( joc, was_loaded, "point", nested.first );
mandatory( joc, was_loaded, "special", nested.second );
mandatory( joc, false, "point", nested.first );
mandatory( joc, false, "special", nested.second );
nested_.insert( nested );
}
}
Expand Down
Loading