games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Some preparation towards mantis #1743:

Browse Source 
- refactored CRandomGenerator (added util methods, improved method names)
- usages of std::minstd_ran are replaced by CRandomGenerator (not in entire code base, C rand() usages are still not replaced)
- refactored getArtSync method of CArtHandler -> now named pickRandomArtifact
- fixed some compiler warnings
- updated source code URL in VCMI spec
This commit is contained in:
beegee1
2014-03-17 19:51:07 +00:00
parent 1aff899f5b
commit fe1b16a7ec
22 changed files with 6774 additions and 6695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/rmg/CMapGenerator.cpp
View File

@ -35,9 +35,9 @@ CMapGenerator::~CMapGenerator()
std::unique_ptr<CMap> CMapGenerator::generate(CMapGenOptions * mapGenOptions, int randomSeed /*= std::time(nullptr)*/)
{
this->randomSeed = randomSeed;
gen.seed(this->randomSeed);
rand.setSeed(this->randomSeed);
this->mapGenOptions = mapGenOptions;
this->mapGenOptions->finalize(gen);
this->mapGenOptions->finalize(rand);
map = make_unique<CMap>();
editManager = map->getEditManager();
@ -125,7 +125,8 @@ void CMapGenerator::addPlayerInfo()
{
player.canHumanPlay = true;
}
auto itTeam = std::next(teamNumbers[j].begin(), gen.getInteger(0, teamNumbers[j].size() - 1));
auto itTeam = RandomGeneratorUtil::nextItem(teamNumbers[j], rand);
player.team = TeamID(*itTeam);
teamNumbers[j].erase(itTeam);
map->players[pSettings.getColor().getNum()] = player;
@ -138,9 +139,9 @@ void CMapGenerator::addPlayerInfo()
void CMapGenerator::genTerrain()
{
map->initTerrain();
editManager->clearTerrain(&gen);
editManager->clearTerrain(&rand);
editManager->getTerrainSelection().selectRange(MapRect(int3(4, 4, 0), 24, 30));
editManager->drawTerrain(ETerrainType::GRASS, &gen);
editManager->drawTerrain(ETerrainType::GRASS, &rand);
}
void CMapGenerator::genTowns()
@ -158,7 +159,11 @@ void CMapGenerator::genTowns()
auto town = new CGTownInstance();
town->ID = Obj::TOWN;
int townId = mapGenOptions->getPlayersSettings().find(PlayerColor(i))->second.getStartingTown();
if(townId == CMapGenOptions::CPlayerSettings::RANDOM_TOWN) townId = gen.getInteger(0, 8); // Default towns
if(townId == CMapGenOptions::CPlayerSettings::RANDOM_TOWN)
{
// select default towns
townId = rand.nextInt(8);
}
town->subID = townId;
town->tempOwner = owner;
town->appearance = VLC->dobjinfo->pickCandidates(town->ID, town->subID, map->getTile(townPos[side]).terType).front();