From 52145379e45bf92a5dd6b9aaa961eb65da9749a1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 26 Apr 2015 01:06:59 +0300 Subject: Revert "Add CilkPlus support into map.cpp" This reverts commit 30da377919524a96a385cbe16f8ab74d5a4a7fab. This commit improve performance only a bit but heavy use all cores. --- src/resources/map/map.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/resources/map') diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index c7eed522d..18e3dc7f5 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -331,7 +331,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY) // Make sure actors are sorted ascending by Y-coordinate // so that they overlap correctly BLOCK_START("Map::draw sort") - cilk_spawn mActors.sort(actorCompare); + mActors.sort(actorCompare); BLOCK_END("Map::draw sort") // update scrolling of all ambient layers @@ -379,8 +379,6 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY) } #endif - cilk_sync; - if (mDrawLayersFlags == MapType::SPECIAL3 || mDrawLayersFlags == MapType::SPECIAL4 || mDrawLayersFlags == MapType::BLACKWHITE) -- cgit v1.2.3-60-g2f50