0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bugfix generate random map unique names

Browse source 
The used names was never set so the check for duplicated names did not
work. Detected by cppcheck.
This commit is contained in:
Rikard Falkeborn 2018-08-30 20:16:23 +02:00 • committed by Jyrki Vesterinen
parent 6772682b7c
commit 12f560d495
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/generators/default_map_generator_job.cpp
View file

@ -1180,13 +1180,13 @@ std::string default_map_generator_job::default_generate_map(generator_data data,
* roads could split a forest)
*/
if(misc_labels != nullptr) {
std::set<std::string> used_names;
for(int x = data.width / 3; x < (data.width / 3)*2; x++) {
for(int y = data.height / 3; y < (data.height / 3) * 2;y++) {
//check the terrain of the tile
const map_location loc(x - data.width / 3, y - data.height / 3);
const t_translation::terrain_code terr = terrain[x][y];
std::string name, base_name;
std::set<std::string> used_names;
std::string name = "", base_name;
if(t_translation::terrain_matches(terr, t_translation::ALL_MOUNTAINS)) {
//name every 15th mountain
@ -1223,6 +1223,9 @@ std::string default_map_generator_job::default_generate_map(generator_data data,
flood_name(loc, base_name, swamp_names, t_translation::ALL_SWAMPS, terrain, data.width, data.height, 0, misc_labels, name);
}
}
if(!name.empty()) {
used_names.insert(name);
}
}
}
}