games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

Handle ObjectInfo via pointer to avoid expensive copy.

Browse Source
This commit is contained in:
DjWarmonger 2016-08-11 10:49:19 +02:00
parent 19ea46a6d2
commit 452027cd8d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/rmg/CRmgTemplateZone.cpp
View File

@ -2220,7 +2220,7 @@ ObjectInfo CRmgTemplateZone::getRandomObject(CMapGenerator* gen, CTreasurePileIn
{ {
//int objectsVisitableFromBottom = 0; //for debug //int objectsVisitableFromBottom = 0; //for debug
std::vector<std::pair<ui32, ObjectInfo>> thresholds; std::vector<std::pair<ui32, ObjectInfo*>> thresholds; //handle complex object via pointer
ui32 total = 0; ui32 total = 0;
//calculate actual treasure value range based on remaining value //calculate actual treasure value range based on remaining value
@ -2322,8 +2322,7 @@ ObjectInfo CRmgTemplateZone::getRandomObject(CMapGenerator* gen, CTreasurePileIn
total += oi.probability; total += oi.probability;
//FIXME: apparently this is quite expensive operation, but "reserve" doesn't improve speed thresholds.push_back (std::make_pair (total, &oi));
thresholds.push_back (std::make_pair (total, oi));
} }
} }
@ -2362,11 +2361,11 @@ ObjectInfo CRmgTemplateZone::getRandomObject(CMapGenerator* gen, CTreasurePileIn
//binary search = fastest //binary search = fastest
auto it = std::lower_bound(thresholds.begin(), thresholds.end(), r, auto it = std::lower_bound(thresholds.begin(), thresholds.end(), r,
[](const std::pair<ui32, ObjectInfo> &rhs, const int lhs)->bool [](const std::pair<ui32, ObjectInfo*> &rhs, const int lhs)->bool
{ {
return rhs.first < lhs; return rhs.first < lhs;
}); });
return it->second; return *(it->second);
} }
return ObjectInfo(); // unreachable return ObjectInfo(); // unreachable