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

Protect every access to zone tiles with a mutex

Browse Source
This commit is contained in:
Tomasz Zieliński
2024-03-27 06:16:48 +01:00
parent cfc4a26f55
commit d8c93cb222
20 changed files with 385 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/rmg/modificators/Modificator.cpp
View File

@ -35,7 +35,7 @@ const std::string & Modificator::getName() const
bool Modificator::isReady()
{
Lock lock(mx, boost::try_to_lock_t{});
Lock lock(mx, boost::try_to_lock);
if (!lock.owns_lock())
{
return false;
@ -63,7 +63,7 @@ bool Modificator::isReady()
bool Modificator::isFinished()
{
Lock lock(mx, boost::try_to_lock_t{});
Lock lock(mx, boost::try_to_lock);
if (!lock.owns_lock())
{
return false;
@ -119,6 +119,8 @@ void Modificator::postfunction(Modificator * modificator)
void Modificator::dump()
{
// TODO: Refactor to lock zone area only once
std::ofstream out(boost::str(boost::format("seed_%d_modzone_%d_%s.txt") % generator.getRandomSeed() % zone.getId() % getName()));
int levels = map.levels();
int width = map.width();
@ -140,13 +142,13 @@ void Modificator::dump()
char Modificator::dump(const int3 & t)
{
if(zone.freePaths().contains(t))
if(zone.freePaths()->contains(t))
return '.'; //free path
if(zone.areaPossible().contains(t))
if(zone.areaPossible()->contains(t))
return ' '; //possible
if(zone.areaUsed().contains(t))
if(zone.areaUsed()->contains(t))
return 'U'; //used
if(zone.area().contains(t))
if(zone.area()->contains(t))
{
if(map.shouldBeBlocked(t))
return '#'; //obstacle