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

Use CompoundMapObjectID in ObjectInfo

Browse Source
This commit is contained in:
Tomasz Zieliński
2024-09-14 09:23:28 +02:00
parent 9591ce1ab4
commit 4d4538a48d
5 changed files with 54 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/rmg/modificators/ObjectDistributor.cpp
View File

@ -45,7 +45,6 @@ void ObjectDistributor::init()
void ObjectDistributor::distributeLimitedObjects()
{
ObjectInfo oi;
auto zones = map.getZones();
for (auto primaryID : VLC->objtypeh->knownObjects())
@ -81,6 +80,8 @@ void ObjectDistributor::distributeLimitedObjects()
RandomGeneratorUtil::randomShuffle(matchingZones, zone.getRand());
for (auto& zone : matchingZones)
{
ObjectInfo oi(primaryID, secondaryID);
oi.generateObject = [cb=map.mapInstance->cb, primaryID, secondaryID]() -> CGObjectInstance *
{
return VLC->objtypeh->getHandlerFor(primaryID, secondaryID)->create(cb, nullptr);