diff --git a/lib/rmg/threadpool/MapProxy.cpp b/lib/rmg/threadpool/MapProxy.cpp index da1ce88e9..af872e2c5 100644 --- a/lib/rmg/threadpool/MapProxy.cpp +++ b/lib/rmg/threadpool/MapProxy.cpp @@ -14,46 +14,46 @@ VCMI_LIB_NAMESPACE_BEGIN MapProxy::MapProxy(RmgMap & map): - map(map) + map(map) { } void MapProxy::insertObject(CGObjectInstance * obj) { - Lock lock(mx); - map.getEditManager()->insertObject(obj); + Lock lock(mx); + map.getEditManager()->insertObject(obj); } void MapProxy::insertObjects(std::set& objects) { - Lock lock(mx); - map.getEditManager()->insertObjects(objects); + Lock lock(mx); + map.getEditManager()->insertObjects(objects); } void MapProxy::removeObject(CGObjectInstance * obj) { - Lock lock(mx); - map.getEditManager()->removeObject(obj); + Lock lock(mx); + map.getEditManager()->removeObject(obj); } void MapProxy::drawTerrain(CRandomGenerator & generator, std::vector & tiles, TerrainId terrain) { - Lock lock(mx); + Lock lock(mx); map.getEditManager()->getTerrainSelection().setSelection(tiles); map.getEditManager()->drawTerrain(terrain, map.getDecorationsPercentage(), &generator); } void MapProxy::drawRivers(CRandomGenerator & generator, std::vector & tiles, TerrainId terrain) { - Lock lock(mx); + Lock lock(mx); map.getEditManager()->getTerrainSelection().setSelection(tiles); map.getEditManager()->drawRiver(VLC->terrainTypeHandler->getById(terrain)->river, &generator); } void MapProxy::drawRoads(CRandomGenerator & generator, std::vector & tiles, RoadId roadType) { - Lock lock(mx); - map.getEditManager()->getTerrainSelection().setSelection(tiles); + Lock lock(mx); + map.getEditManager()->getTerrainSelection().setSelection(tiles); map.getEditManager()->drawRoad(roadType, &generator); } diff --git a/lib/rmg/threadpool/MapProxy.h b/lib/rmg/threadpool/MapProxy.h index bf74e88e7..9cb265f8f 100644 --- a/lib/rmg/threadpool/MapProxy.h +++ b/lib/rmg/threadpool/MapProxy.h @@ -22,21 +22,21 @@ class RmgMap; class MapProxy { public: - MapProxy(RmgMap & map); + MapProxy(RmgMap & map); - void insertObject(CGObjectInstance * obj); - void insertObjects(std::set& objects); - void removeObject(CGObjectInstance* obj); + void insertObject(CGObjectInstance * obj); + void insertObjects(std::set& objects); + void removeObject(CGObjectInstance* obj); void drawTerrain(CRandomGenerator & generator, std::vector & tiles, TerrainId terrain); - void drawRivers(CRandomGenerator & generator, std::vector & tiles, TerrainId terrain); - void drawRoads(CRandomGenerator & generator, std::vector & tiles, RoadId roadType); + void drawRivers(CRandomGenerator & generator, std::vector & tiles, TerrainId terrain); + void drawRoads(CRandomGenerator & generator, std::vector & tiles, RoadId roadType); private: - mutable boost::shared_mutex mx; - using Lock = boost::unique_lock; + mutable boost::shared_mutex mx; + using Lock = boost::unique_lock; - RmgMap & map; + RmgMap & map; }; VCMI_LIB_NAMESPACE_END