1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-26 11:27:39 +00:00

conflict resolved

This commit is contained in:
Zeno Rogue
2021-07-12 09:55:25 +02:00
24 changed files with 144 additions and 192 deletions

View File

@@ -2001,8 +2001,8 @@ EX void generate_mines() {
for(cell *c: currentmap->allcells())
if(c->wall == waMineUnknown)
candidates.push_back(c);
hrandom_shuffle(candidates);
bounded_mine_max = isize(candidates);
hrandom_shuffle(&candidates[0], bounded_mine_max);
bounded_mine_quantity = int(bounded_mine_max * bounded_mine_percentage + 0.5);
for(int i=0; i<bounded_mine_quantity; i++) candidates[i]->wall = waMineMine;
}