Skip to content

Commit

Permalink
Merge pull request #1888 from ineveraskedforthis/main
Browse files Browse the repository at this point in the history
Minor workaround to allow generation of DOD rivers
  • Loading branch information
schombert authored Feb 1, 2025
2 parents 201c6b8 + 7c42c1d commit c97335b
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/map/map_borders.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1404,9 +1404,9 @@ void display_data::create_curved_river_vertices(parsers::scenario_building_conte
runner.done = true;
}
}
} else {
exists_running_runner = true;
} else {
if(is_river_merge(river_data[runner.x + runner.y * size_x])) {
exists_running_runner = true;
runner.waiting_for_merge = true;
} else {
bool first_child = true;
Expand All @@ -1427,6 +1427,8 @@ void display_data::create_curved_river_vertices(parsers::scenario_building_conte
width = runner.position->width;
}

exists_running_runner = true;

river_vertex* new_river_vertex = nullptr;

bool we_will_move_forward = false;
Expand Down Expand Up @@ -1462,6 +1464,7 @@ void display_data::create_curved_river_vertices(parsers::scenario_building_conte
}

if(next_position != nullptr) {
exists_running_runner = true;
runner.x = next_x;
runner.y = next_y;
runner.position = next_position;
Expand Down

0 comments on commit c97335b

Please sign in to comment.